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/space_node
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/space_node')
-rw-r--r--source/blender/editors/space_node/node_edit.c4
-rw-r--r--source/blender/editors/space_node/node_header.c8
-rw-r--r--source/blender/editors/space_node/node_intern.h8
-rw-r--r--source/blender/editors/space_node/node_ops.c18
-rw-r--r--source/blender/editors/space_node/node_select.c9
-rw-r--r--source/blender/editors/space_node/node_state.c4
6 files changed, 26 insertions, 25 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index 68e9d38e192..d77d2aa09cb 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -2518,12 +2518,12 @@ static int node_delete_selection_exec(bContext *C, wmOperator *op)
/* operators */
-void NODE_OT_delete_selection(wmOperatorType *ot)
+void NODE_OT_delete(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Delete";
- ot->idname= "NODE_OT_delete_selection";
+ ot->idname= "NODE_OT_delete";
/* api callbacks */
ot->exec= node_delete_selection_exec;
diff --git a/source/blender/editors/space_node/node_header.c b/source/blender/editors/space_node/node_header.c
index d2e7df55e54..14545b87cd4 100644
--- a/source/blender/editors/space_node/node_header.c
+++ b/source/blender/editors/space_node/node_header.c
@@ -75,7 +75,7 @@ static void do_node_selectmenu(bContext *C, void *arg, int event)
switch(event) {
case 1: /* border select */
- WM_operator_name_call(C, "NODE_OT_border_select", WM_OP_INVOKE_REGION_WIN, NULL);
+ WM_operator_name_call(C, "NODE_OT_select_border", WM_OP_INVOKE_REGION_WIN, NULL);
break;
case 2: /* select/deselect all */
// XXX node_deselectall(snode, 1);
@@ -582,13 +582,13 @@ static void do_node_viewmenu(bContext *C, void *arg, int event)
switch(event) {
case 1: /* Zoom in */
- WM_operator_name_call(C, "View2D_OT_view_zoomin", WM_OP_EXEC_REGION_WIN, NULL);
+ WM_operator_name_call(C, "VIEW2D_OT_zoom_in", WM_OP_EXEC_REGION_WIN, NULL);
break;
case 2: /* View all */
- WM_operator_name_call(C, "View2D_OT_view_zoomout", WM_OP_EXEC_REGION_WIN, NULL);
+ WM_operator_name_call(C, "VIEW2D_OT_zoom_out", WM_OP_EXEC_REGION_WIN, NULL);
break;
case 3: /* View all */
- WM_operator_name_call(C, "NODE_OT_fit_all", WM_OP_EXEC_REGION_WIN, NULL);
+ WM_operator_name_call(C, "NODE_OT_view_all", WM_OP_EXEC_REGION_WIN, NULL);
break;
case 4: /* Grease Pencil */
// XXX add_blockhandler(sa, NODES_HANDLER_GREASEPENCIL, UI_PNL_UNSTOW);
diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h
index de3999ae5cb..4796db98e95 100644
--- a/source/blender/editors/space_node/node_intern.h
+++ b/source/blender/editors/space_node/node_intern.h
@@ -55,10 +55,10 @@ void node_keymap(wmWindowManager *wm);
/* node_select.c */
void NODE_OT_select(struct wmOperatorType *ot);
-void NODE_OT_extend_select(struct wmOperatorType *ot);
+void NODE_OT_select_extend(struct wmOperatorType *ot);
void NODE_OT_visibility_toggle(struct wmOperatorType *ot);
-void NODE_OT_fit_all(struct wmOperatorType *ot);
-void NODE_OT_border_select(struct wmOperatorType *ot);
+void NODE_OT_view_all(struct wmOperatorType *ot);
+void NODE_OT_select_border(struct wmOperatorType *ot);
/* drawnode.c */
void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link);
@@ -83,7 +83,7 @@ bNode *snode_get_editgroup(SpaceNode *snode);
void snode_autoconnect(SpaceNode *snode, bNode *node_to, int flag);
void NODE_OT_link(struct wmOperatorType *ot);
-void NODE_OT_delete_selection(struct wmOperatorType *ot);
+void NODE_OT_delete(struct wmOperatorType *ot);
void NODE_OT_size_widget(struct wmOperatorType *ot);
void NODE_OT_links_cut(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c
index dc6ae03cef9..cef867faa1f 100644
--- a/source/blender/editors/space_node/node_ops.c
+++ b/source/blender/editors/space_node/node_ops.c
@@ -51,11 +51,11 @@
void node_operatortypes(void)
{
WM_operatortype_append(NODE_OT_select);
- WM_operatortype_append(NODE_OT_extend_select);
+ WM_operatortype_append(NODE_OT_select_extend);
WM_operatortype_append(NODE_OT_visibility_toggle);
- WM_operatortype_append(NODE_OT_fit_all);
- WM_operatortype_append(NODE_OT_border_select);
- WM_operatortype_append(NODE_OT_delete_selection);
+ WM_operatortype_append(NODE_OT_view_all);
+ WM_operatortype_append(NODE_OT_select_border);
+ WM_operatortype_append(NODE_OT_delete);
WM_operatortype_append(NODE_OT_link);
WM_operatortype_append(NODE_OT_size_widget);
WM_operatortype_append(NODE_OT_links_cut);
@@ -68,17 +68,17 @@ void node_keymap(struct wmWindowManager *wm)
/* mouse select in nodes used to be both keys, it's UI elements... */
RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_select", ACTIONMOUSE, KM_PRESS, 0, 0)->ptr, "select_type", NODE_SELECT_MOUSE);
RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_select", SELECTMOUSE, KM_PRESS, 0, 0)->ptr, "select_type", NODE_SELECT_MOUSE);
- RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_extend_select", ACTIONMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "select_type", NODE_SELECT_MOUSE);
- RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_extend_select", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "select_type", NODE_SELECT_MOUSE);
+ RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_select_extend", ACTIONMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "select_type", NODE_SELECT_MOUSE);
+ RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_select_extend", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "select_type", NODE_SELECT_MOUSE);
WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_size_widget", LEFTMOUSE, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_visibility_toggle", LEFTMOUSE, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_links_cut", LEFTMOUSE, KM_PRESS, KM_ALT, 0);
- WM_keymap_add_item(keymap, "NODE_OT_fit_all", HOMEKEY, KM_PRESS, 0, 0);
- WM_keymap_add_item(keymap, "NODE_OT_border_select", BKEY, KM_PRESS, 0, 0);
- WM_keymap_add_item(keymap, "NODE_OT_delete_selection", XKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "NODE_OT_view_all", HOMEKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "NODE_OT_select_border", BKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "NODE_OT_delete", XKEY, KM_PRESS, 0, 0);
transform_keymap_for_space(wm, keymap, SPACE_NODE);
}
diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c
index 0006d227d1a..3c37793e8d6 100644
--- a/source/blender/editors/space_node/node_select.c
+++ b/source/blender/editors/space_node/node_select.c
@@ -180,11 +180,12 @@ static EnumPropertyItem prop_select_items[] = {
{NODE_SELECT_MOUSE, "NORMAL", "Normal Select", "Select using the mouse"},
{0, NULL, NULL, NULL}};
-void NODE_OT_extend_select(wmOperatorType *ot)
+void NODE_OT_select_extend(wmOperatorType *ot)
{
+ // XXX - Todo - This should just be a toggle option for NODE_OT_select not its own op
/* identifiers */
ot->name= "Activate/Select (Shift)";
- ot->idname= "NODE_OT_extend_select";
+ ot->idname= "NODE_OT_select_extend";
/* api callbacks */
ot->invoke= node_extend_select_invoke;
@@ -265,11 +266,11 @@ static int node_borderselect_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
-void NODE_OT_border_select(wmOperatorType *ot)
+void NODE_OT_select_border(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Border Select";
- ot->idname= "NODE_OT_border_select";
+ ot->idname= "NODE_OT_select_border";
/* api callbacks */
ot->invoke= WM_border_select_invoke;
diff --git a/source/blender/editors/space_node/node_state.c b/source/blender/editors/space_node/node_state.c
index ee3bfbf0fbf..f05a24ef05a 100644
--- a/source/blender/editors/space_node/node_state.c
+++ b/source/blender/editors/space_node/node_state.c
@@ -193,11 +193,11 @@ static int node_fit_all_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
-void NODE_OT_fit_all(wmOperatorType *ot)
+void NODE_OT_view_all(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Fit All";
- ot->idname= "NODE_OT_fit_all";
+ ot->idname= "NODE_OT_view_all";
/* api callbacks */
ot->exec= node_fit_all_exec;