From 89d6cc7e23a26a3036bfa52592303e6d745edd09 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sat, 22 Sep 2012 20:07:30 +0000 Subject: =?UTF-8?q?Make=20"name"=20member=20of=20RNA=20KeymapItem=20struct?= =?UTF-8?q?=20return=20the=20translated=20name=20of=20the=20underlying=20o?= =?UTF-8?q?perator.=20Else,=20op=20names=20are=20usually=20not=20translate?= =?UTF-8?q?d=20in=20keymap=20part=20of=20the=20user=20preferences!=20Thx?= =?UTF-8?q?=20to=20Mikl=C3=B3s=20Poms=C3=A1r=20for=20pointing=20this=20bug?= =?UTF-8?q?.=20:)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/blender/makesrna/intern/rna_wm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 847641770e1..d8753f4ff43 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -765,14 +765,14 @@ static void rna_wmKeyMapItem_name_get(PointerRNA *ptr, char *value) { wmKeyMapItem *kmi = ptr->data; wmOperatorType *ot = WM_operatortype_find(kmi->idname, 1); - strcpy(value, ot ? ot->name : kmi->idname); + strcpy(value, ot ? RNA_struct_ui_name(ot->srna) : kmi->idname); } static int rna_wmKeyMapItem_name_length(PointerRNA *ptr) { wmKeyMapItem *kmi = ptr->data; wmOperatorType *ot = WM_operatortype_find(kmi->idname, 1); - return strlen(ot ? ot->name : kmi->idname); + return strlen(ot ? RNA_struct_ui_name(ot->srna) : kmi->idname); } static int rna_KeyMapItem_userdefined_get(PointerRNA *ptr) @@ -1793,7 +1793,7 @@ static void rna_def_keyconfig(BlenderRNA *brna) * fallback on the operator ID */ prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "Name", "Name of operator to call on input event"); + RNA_def_property_ui_text(prop, "Name", "Name of operator (translated) to call on input event"); RNA_def_property_string_funcs(prop, "rna_wmKeyMapItem_name_get", "rna_wmKeyMapItem_name_length", NULL); prop = RNA_def_property(srna, "properties", PROP_POINTER, PROP_NONE); -- cgit v1.2.3