curve op align to naming convention
authorShaul Kedem <shaul_kedem@yahoo.com>
Sun, 12 Apr 2009 22:43:07 +0000 (22:43 +0000)
committerShaul Kedem <shaul_kedem@yahoo.com>
Sun, 12 Apr 2009 22:43:07 +0000 (22:43 +0000)
source/blender/editors/curve/curve_intern.h
source/blender/editors/curve/curve_ops.c
source/blender/editors/curve/editcurve.c
source/blender/editors/curve/editfont.c
source/blender/editors/space_view3d/view3d_header.c

index 71684ceae7a27322a95d77cf8eb6b179ca3a98c8..a73a54323ee6d5cd0ea5938181f104e5beaf444b 100644 (file)
@@ -41,7 +41,7 @@ enum { CASE_LOWER, CASE_UPPER };
 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_toggle(struct wmOperatorType *ot);
 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_switch_direction(struct wmOperatorType *ot);
 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);
 
index a0390fe1084aa1792476946403ca288848bbfb88..c27c498f55ee182c8e8d1bc4c31b7ce4db080a60 100644 (file)
@@ -96,7 +96,7 @@ void CURVE_OT_specials_menu(wmOperatorType *ot)
 
 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 @@ void ED_operatortypes_curve(void)
        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 @@ void ED_operatortypes_curve(void)
        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 @@ void ED_keymap_curve(wmWindowManager *wm)
        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);
index cbc282fa376746d16d4b642c0fe8a9e92e041d25..8c9a282d4ef8012dcdd444c669d3504aae6a2b70 100644 (file)
@@ -3404,11 +3404,11 @@ static int add_vertex_invoke(bContext *C, wmOperator *op, wmEvent *event)
        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;
index e6992009056d2a8945c8c7f54a0435da818350fc..ec4e79a7e5a0ec13646db532ad0df81a7e7cdbbc 100644 (file)
@@ -401,11 +401,11 @@ static int paste_file_invoke(bContext *C, wmOperator *op, wmEvent *event)
        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 @@ static int paste_buffer_exec(bContext *C, wmOperator *op)
        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 @@ static int copy_text_exec(bContext *C, wmOperator *op)
        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 @@ static int cut_text_exec(bContext *C, wmOperator *op)
        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 @@ static int paste_text_exec(bContext *C, wmOperator *op)
        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 @@ static int insert_text_invoke(bContext *C, wmOperator *op, wmEvent *evt)
        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;
index ce87b2994bbc183c6a3b827f4096128fa2227cb2..cfb4170ae7879fa2156d856f3d9b58c790e994b6 100644 (file)
@@ -3481,37 +3481,37 @@ static void view3d_edit_text_charsmenu(bContext *C, uiMenuItem *head, void *arg_
 {
        /* 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");
+       uiMenuItemStringO(head, "Double >>|Alt >", 0, "FONT_OT_text_insert", "text", "\xC2\xBB");
+       uiMenuItemStringO(head, "Double <<|Alt <", 0, "FONT_OT_text_insert", "text", "\xC2\xAB");
+       uiMenuItemStringO(head, "Promillage|Alt %", 0, "FONT_OT_text_insert", "text", "\xE2\x80\xB0");
        
        uiMenuSeparator(head);
        
-       uiMenuItemStringO(head, "Dutch Florin|Alt F", 0, "FONT_OT_insert_text", "text", "\xC2\xA4");
-       uiMenuItemStringO(head, "British Pound|Alt L", 0, "FONT_OT_insert_text", "text", "\xC2\xA3");
-       uiMenuItemStringO(head, "Japanese Yen|Alt Y", 0, "FONT_OT_insert_text", "text", "\xC2\xA5");
+       uiMenuItemStringO(head, "Dutch Florin|Alt F", 0, "FONT_OT_text_insert", "text", "\xC2\xA4");
+       uiMenuItemStringO(head, "British Pound|Alt L", 0, "FONT_OT_text_insert", "text", "\xC2\xA3");
+       uiMenuItemStringO(head, "Japanese Yen|Alt Y", 0, "FONT_OT_text_insert", "text", "\xC2\xA5");
        
        uiMenuSeparator(head);
        
-       uiMenuItemStringO(head, "German S|Alt S", 0, "FONT_OT_insert_text", "text", "\xC3\x9F");
-       uiMenuItemStringO(head, "Spanish Question Mark|Alt ?", 0, "FONT_OT_insert_text", "text", "\xC2\xBF");
-       uiMenuItemStringO(head, "Spanish Exclamation Mark|Alt !", 0, "FONT_OT_insert_text", "text", "\xC2\xA1");
+       uiMenuItemStringO(head, "German S|Alt S", 0, "FONT_OT_text_insert", "text", "\xC3\x9F");
+       uiMenuItemStringO(head, "Spanish Question Mark|Alt ?", 0, "FONT_OT_text_insert", "text", "\xC2\xBF");
+       uiMenuItemStringO(head, "Spanish Exclamation Mark|Alt !", 0, "FONT_OT_text_insert", "text", "\xC2\xA1");
 }
 
 static void view3d_edit_textmenu(bContext *C, uiMenuItem *head, void *arg_unused)
 {
-       uiMenuItemO(head, 0, "FONT_OT_paste_file");
+       uiMenuItemO(head, 0, "FONT_OT_file_paste");
        uiMenuSeparator(head);
        uiMenuLevel(head, "Special Characters", view3d_edit_text_charsmenu);
 }