Revision: 19694 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19694 Author: shul Date: 2009-04-13 00:43:07 +0200 (Mon, 13 Apr 2009)
Log Message: ----------- curve op align to naming convention Modified Paths: -------------- 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/space_view3d/view3d_header.c Modified: branches/blender2.5/blender/source/blender/editors/curve/curve_intern.h =================================================================== --- branches/blender2.5/blender/source/blender/editors/curve/curve_intern.h 2009-04-12 22:16:21 UTC (rev 19693) +++ branches/blender2.5/blender/source/blender/editors/curve/curve_intern.h 2009-04-12 22:43:07 UTC (rev 19694) @@ -41,7 +41,7 @@ enum { LINE_BEGIN, LINE_END, PREV_CHAR, NEXT_CHAR, PREV_WORD, NEXT_WORD, PREV_LINE, NEXT_LINE, PREV_PAGE, NEXT_PAGE }; -void FONT_OT_insert_text(struct wmOperatorType *ot); +void FONT_OT_text_insert(struct wmOperatorType *ot); void FONT_OT_line_break(struct wmOperatorType *ot); void FONT_OT_insert_lorem(struct wmOperatorType *ot); @@ -51,11 +51,11 @@ void FONT_OT_style_set(struct wmOperatorType *ot); void FONT_OT_material_set(struct wmOperatorType *ot); -void FONT_OT_copy_text(struct wmOperatorType *ot); -void FONT_OT_cut_text(struct wmOperatorType *ot); -void FONT_OT_paste_text(struct wmOperatorType *ot); -void FONT_OT_paste_file(struct wmOperatorType *ot); -void FONT_OT_paste_buffer(struct wmOperatorType *ot); +void FONT_OT_text_copy(struct wmOperatorType *ot); +void FONT_OT_text_cut(struct wmOperatorType *ot); +void FONT_OT_text_paste(struct wmOperatorType *ot); +void FONT_OT_file_paste(struct wmOperatorType *ot); +void FONT_OT_buffer_paste(struct wmOperatorType *ot); void FONT_OT_move(struct wmOperatorType *ot); void FONT_OT_move_select(struct wmOperatorType *ot); @@ -99,7 +99,7 @@ void CURVE_OT_subdivide(struct wmOperatorType *ot); void CURVE_OT_make_segment(struct wmOperatorType *ot); void CURVE_OT_spin(struct wmOperatorType *ot); -void CURVE_OT_add_vertex(struct wmOperatorType *ot); +void CURVE_OT_vertex_add(struct wmOperatorType *ot); void CURVE_OT_extrude(struct wmOperatorType *ot); void CURVE_OT_cyclic_toggle(struct wmOperatorType *ot); Modified: branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c =================================================================== --- branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c 2009-04-12 22:16:21 UTC (rev 19693) +++ branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c 2009-04-12 22:43:07 UTC (rev 19694) @@ -96,7 +96,7 @@ void ED_operatortypes_curve(void) { - WM_operatortype_append(FONT_OT_insert_text); + WM_operatortype_append(FONT_OT_text_insert); WM_operatortype_append(FONT_OT_line_break); WM_operatortype_append(FONT_OT_insert_lorem); @@ -106,11 +106,11 @@ WM_operatortype_append(FONT_OT_style_set); WM_operatortype_append(FONT_OT_material_set); - WM_operatortype_append(FONT_OT_copy_text); - WM_operatortype_append(FONT_OT_cut_text); - WM_operatortype_append(FONT_OT_paste_text); - WM_operatortype_append(FONT_OT_paste_file); - WM_operatortype_append(FONT_OT_paste_buffer); + WM_operatortype_append(FONT_OT_text_copy); + WM_operatortype_append(FONT_OT_text_cut); + WM_operatortype_append(FONT_OT_text_paste); + WM_operatortype_append(FONT_OT_file_paste); + WM_operatortype_append(FONT_OT_buffer_paste); WM_operatortype_append(FONT_OT_move); WM_operatortype_append(FONT_OT_move_select); @@ -153,7 +153,7 @@ WM_operatortype_append(CURVE_OT_subdivide); WM_operatortype_append(CURVE_OT_make_segment); WM_operatortype_append(CURVE_OT_spin); - WM_operatortype_append(CURVE_OT_add_vertex); + WM_operatortype_append(CURVE_OT_vertex_add); WM_operatortype_append(CURVE_OT_extrude); WM_operatortype_append(CURVE_OT_cyclic_toggle); @@ -200,18 +200,18 @@ RNA_int_set(WM_keymap_add_item(keymap, "FONT_OT_change_character", UPARROWKEY, KM_PRESS, KM_ALT, 0)->ptr, "delta", 1); RNA_int_set(WM_keymap_add_item(keymap, "FONT_OT_change_character", DOWNARROWKEY, KM_PRESS, KM_ALT, 0)->ptr, "delta", -1); - WM_keymap_add_item(keymap, "FONT_OT_copy_text", CKEY, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item(keymap, "FONT_OT_cut_text", XKEY, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item(keymap, "FONT_OT_paste_text", PKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "FONT_OT_text_copy", CKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "FONT_OT_text_cut", XKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "FONT_OT_text_paste", PKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "FONT_OT_line_break", RETKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "FONT_OT_insert_text", KM_TEXTINPUT, KM_ANY, KM_ANY, 0); // last! + WM_keymap_add_item(keymap, "FONT_OT_text_insert", KM_TEXTINPUT, KM_ANY, KM_ANY, 0); // last! /* only set in editmode curve, by space_view3d listener */ keymap= WM_keymap_listbase(wm, "Curve", 0, 0); WM_keymap_add_item(keymap, "OBJECT_OT_curve_add", AKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "CURVE_OT_add_vertex", ACTIONMOUSE, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "CURVE_OT_vertex_add", ACTIONMOUSE, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "CURVE_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "CURVE_OT_select_row", RKEY, KM_PRESS, KM_SHIFT, 0); Modified: branches/blender2.5/blender/source/blender/editors/curve/editcurve.c =================================================================== --- branches/blender2.5/blender/source/blender/editors/curve/editcurve.c 2009-04-12 22:16:21 UTC (rev 19693) +++ branches/blender2.5/blender/source/blender/editors/curve/editcurve.c 2009-04-12 22:43:07 UTC (rev 19694) @@ -3404,11 +3404,11 @@ return add_vertex_exec(C, op); } -void CURVE_OT_add_vertex(wmOperatorType *ot) +void CURVE_OT_vertex_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Vertex"; - ot->idname= "CURVE_OT_add_vertex"; + ot->idname= "CURVE_OT_vertex_add"; /* api callbacks */ ot->exec= add_vertex_exec; Modified: branches/blender2.5/blender/source/blender/editors/curve/editfont.c =================================================================== --- branches/blender2.5/blender/source/blender/editors/curve/editfont.c 2009-04-12 22:16:21 UTC (rev 19693) +++ branches/blender2.5/blender/source/blender/editors/curve/editfont.c 2009-04-12 22:43:07 UTC (rev 19694) @@ -401,11 +401,11 @@ return OPERATOR_RUNNING_MODAL; } -void FONT_OT_paste_file(wmOperatorType *ot) +void FONT_OT_file_paste(wmOperatorType *ot) { /* identifiers */ ot->name= "Paste File"; - ot->idname= "FONT_OT_paste_file"; + ot->idname= "FONT_OT_file_paste"; /* api callbacks */ ot->exec= paste_file_exec; @@ -449,11 +449,11 @@ return paste_file(C, NULL, filename); } -void FONT_OT_paste_buffer(wmOperatorType *ot) +void FONT_OT_buffer_paste(wmOperatorType *ot) { /* identifiers */ ot->name= "Paste Buffer"; - ot->idname= "FONT_OT_paste_buffer"; + ot->idname= "FONT_OT_buffer_paste"; /* api callbacks */ ot->exec= paste_buffer_exec; @@ -769,11 +769,11 @@ return OPERATOR_FINISHED; } -void FONT_OT_copy_text(wmOperatorType *ot) +void FONT_OT_text_copy(wmOperatorType *ot) { /* identifiers */ ot->name= "Copy Text"; - ot->idname= "FONT_OT_copy_text"; + ot->idname= "FONT_OT_text_copy"; /* api callbacks */ ot->exec= copy_text_exec; @@ -799,11 +799,11 @@ return OPERATOR_FINISHED; } -void FONT_OT_cut_text(wmOperatorType *ot) +void FONT_OT_text_cut(wmOperatorType *ot) { /* identifiers */ ot->name= "Cut Text"; - ot->idname= "FONT_OT_cut_text"; + ot->idname= "FONT_OT_text_cut"; /* api callbacks */ ot->exec= cut_text_exec; @@ -856,11 +856,11 @@ return OPERATOR_FINISHED; } -void FONT_OT_paste_text(wmOperatorType *ot) +void FONT_OT_text_paste(wmOperatorType *ot) { /* identifiers */ ot->name= "Paste Text"; - ot->idname= "FONT_OT_paste_text"; + ot->idname= "FONT_OT_text_paste"; /* api callbacks */ ot->exec= paste_text_exec; @@ -1374,11 +1374,11 @@ return OPERATOR_FINISHED; } -void FONT_OT_insert_text(wmOperatorType *ot) +void FONT_OT_text_insert(wmOperatorType *ot) { /* identifiers */ ot->name= "Insert Text"; - ot->idname= "FONT_OT_insert_text"; + ot->idname= "FONT_OT_text_insert"; /* api callbacks */ ot->exec= insert_text_exec; Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c =================================================================== --- branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c 2009-04-12 22:16:21 UTC (rev 19693) +++ branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c 2009-04-12 22:43:07 UTC (rev 19694) @@ -3481,37 +3481,37 @@ { /* the character codes are specified in UTF-8 */ - uiMenuItemStringO(head, "Copyright|Alt C", 0, "FONT_OT_insert_text", "text", "\xC2\xA9"); - uiMenuItemStringO(head, "Registered Trademark|Alt R", 0, "FONT_OT_insert_text", "text", "\xC2\xAE"); + uiMenuItemStringO(head, "Copyright|Alt C", 0, "FONT_OT_text_insert", "text", "\xC2\xA9"); + uiMenuItemStringO(head, "Registered Trademark|Alt R", 0, "FONT_OT_text_insert", "text", "\xC2\xAE"); uiMenuSeparator(head); - uiMenuItemStringO(head, "Degree Sign|Alt G", 0, "FONT_OT_insert_text", "text", "\xC2\xB0"); - uiMenuItemStringO(head, "Multiplication Sign|Alt x", 0, "FONT_OT_insert_text", "text", "\xC3\x97"); - uiMenuItemStringO(head, "Circle|Alt .", 0, "FONT_OT_insert_text", "text", "\xC2\x8A"); - uiMenuItemStringO(head, "Superscript 1|Alt 1", 0, "FONT_OT_insert_text", "text", "\xC2\xB9"); - uiMenuItemStringO(head, "Superscript 2|Alt 2", 0, "FONT_OT_insert_text", "text", "\xC2\xB2"); - uiMenuItemStringO(head, "Superscript 3|Alt 3", 0, "FONT_OT_insert_text", "text", "\xC2\xB3"); - uiMenuItemStringO(head, "Double >>|Alt >", 0, "FONT_OT_insert_text", "text", "\xC2\xBB"); - uiMenuItemStringO(head, "Double <<|Alt <", 0, "FONT_OT_insert_text", "text", "\xC2\xAB"); - uiMenuItemStringO(head, "Promillage|Alt %", 0, "FONT_OT_insert_text", "text", "\xE2\x80\xB0"); + uiMenuItemStringO(head, "Degree Sign|Alt G", 0, "FONT_OT_text_insert", "text", "\xC2\xB0"); + uiMenuItemStringO(head, "Multiplication Sign|Alt x", 0, "FONT_OT_text_insert", "text", "\xC3\x97"); + uiMenuItemStringO(head, "Circle|Alt .", 0, "FONT_OT_text_insert", "text", "\xC2\x8A"); + uiMenuItemStringO(head, "Superscript 1|Alt 1", 0, "FONT_OT_text_insert", "text", "\xC2\xB9"); + uiMenuItemStringO(head, "Superscript 2|Alt 2", 0, "FONT_OT_text_insert", "text", "\xC2\xB2"); + uiMenuItemStringO(head, "Superscript 3|Alt 3", 0, "FONT_OT_text_insert", "text", "\xC2\xB3"); @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs