From b4c02ee72218fd4c76f7659db2e994895f67dc22 Mon Sep 17 00:00:00 2001 From: Xiao Xiangquan Date: Fri, 8 Jul 2011 04:32:45 +0000 Subject: finish user preference dlg's input handles --- source/blender/editors/space_nla/nla_buttons.c | 6 +- source/blender/editors/space_nla/nla_channels.c | 12 +-- source/blender/editors/space_nla/nla_edit.c | 100 ++++++++++++------------ source/blender/editors/space_nla/nla_select.c | 24 +++--- 4 files changed, 72 insertions(+), 70 deletions(-) (limited to 'source/blender/editors/space_nla') diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 94232699c30..c431f5455ed 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -47,6 +47,8 @@ #include "BLI_editVert.h" #include "BLI_rand.h" +#include "BLF_api.h" + #include "BKE_nla.h" #include "BKE_context.h" #include "BKE_screen.h" @@ -498,9 +500,9 @@ static int nla_properties(bContext *C, wmOperator *UNUSED(op)) void NLA_OT_properties(wmOperatorType *ot) { - ot->name= "Properties"; + ot->name= _("Properties"); ot->idname= "NLA_OT_properties"; - ot->description= "Toggle display properties panel"; + ot->description= _("Toggle display properties panel"); ot->exec= nla_properties; ot->poll= ED_operator_nla_active; diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index 8ce64c6d553..f6aebd57149 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -344,9 +344,9 @@ static int nlachannels_mouseclick_invoke(bContext *C, wmOperator *op, wmEvent *e void NLA_OT_channels_click (wmOperatorType *ot) { /* identifiers */ - ot->name= "Mouse Click on NLA Channels"; + ot->name= _("Mouse Click on NLA Channels"); ot->idname= "NLA_OT_channels_click"; - ot->description= "Handle clicks to select NLA channels"; + ot->description= _("Handle clicks to select NLA channels"); /* api callbacks */ ot->invoke= nlachannels_mouseclick_invoke; @@ -418,9 +418,9 @@ static int nlaedit_add_tracks_exec (bContext *C, wmOperator *op) void NLA_OT_tracks_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Track(s)"; + ot->name= _("Add Track(s)"); ot->idname= "NLA_OT_tracks_add"; - ot->description= "Add NLA-Tracks above/after the selected tracks"; + ot->description= _("Add NLA-Tracks above/after the selected tracks"); /* api callbacks */ ot->exec= nlaedit_add_tracks_exec; @@ -482,9 +482,9 @@ static int nlaedit_delete_tracks_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_delete_tracks (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Tracks"; + ot->name= _("Delete Tracks"); ot->idname= "NLA_OT_delete_tracks"; - ot->description= "Delete selected NLA-Tracks and the strips they contain"; + ot->description= _("Delete selected NLA-Tracks and the strips they contain"); /* api callbacks */ ot->exec= nlaedit_delete_tracks_exec; diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index 934cf8be247..15ab0406b95 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -160,9 +160,9 @@ static int nlaedit_enable_tweakmode_exec (bContext *C, wmOperator *op) void NLA_OT_tweakmode_enter (wmOperatorType *ot) { /* identifiers */ - ot->name= "Enter Tweak Mode"; + ot->name= _("Enter Tweak Mode"); ot->idname= "NLA_OT_tweakmode_enter"; - ot->description= "Enter tweaking mode for the action referenced by the active strip"; + ot->description= _("Enter tweaking mode for the action referenced by the active strip"); /* api callbacks */ ot->exec= nlaedit_enable_tweakmode_exec; @@ -225,9 +225,9 @@ static int nlaedit_disable_tweakmode_exec (bContext *C, wmOperator *op) void NLA_OT_tweakmode_exit (wmOperatorType *ot) { /* identifiers */ - ot->name= "Exit Tweak Mode"; + ot->name= _("Exit Tweak Mode"); ot->idname= "NLA_OT_tweakmode_exit"; - ot->description= "Exit tweaking mode for the action referenced by the active strip"; + ot->description= _("Exit tweaking mode for the action referenced by the active strip"); /* api callbacks */ ot->exec= nlaedit_disable_tweakmode_exec; @@ -344,9 +344,9 @@ void NLA_OT_actionclip_add (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add Action Strip"; + ot->name= _("Add Action Strip"); ot->idname= "NLA_OT_actionclip_add"; - ot->description= "Add an Action-Clip strip (i.e. an NLA Strip referencing an Action) to the active track"; + ot->description= _("Add an Action-Clip strip (i.e. an NLA Strip referencing an Action) to the active track"); /* api callbacks */ ot->invoke= WM_enum_search_invoke; @@ -358,7 +358,7 @@ void NLA_OT_actionclip_add (wmOperatorType *ot) /* props */ // TODO: this would be nicer as an ID-pointer... - prop= RNA_def_enum(ot->srna, "action", DummyRNA_NULL_items, 0, "Action", ""); + prop= RNA_def_enum(ot->srna, "action", DummyRNA_NULL_items, 0, _("Action"), ""); RNA_def_enum_funcs(prop, RNA_action_itemf); ot->prop= prop; } @@ -466,9 +466,9 @@ static int nlaedit_add_transition_exec (bContext *C, wmOperator *op) void NLA_OT_transition_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Transition"; + ot->name= _("Add Transition"); ot->idname= "NLA_OT_transition_add"; - ot->description= "Add a transition strip between two adjacent selected strips"; + ot->description= _("Add a transition strip between two adjacent selected strips"); /* api callbacks */ ot->exec= nlaedit_add_transition_exec; @@ -528,9 +528,9 @@ static int nlaedit_add_meta_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_meta_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Meta-Strips"; + ot->name= _("Add Meta-Strips"); ot->idname= "NLA_OT_meta_add"; - ot->description= "Add new meta-strips incorporating the selected strips"; + ot->description= _("Add new meta-strips incorporating the selected strips"); /* api callbacks */ ot->exec= nlaedit_add_meta_exec; @@ -580,9 +580,9 @@ static int nlaedit_remove_meta_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_meta_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Meta-Strips"; + ot->name= _("Remove Meta-Strips"); ot->idname= "NLA_OT_meta_remove"; - ot->description= "Separate out the strips held by the selected meta-strips"; + ot->description= _("Separate out the strips held by the selected meta-strips"); /* api callbacks */ ot->exec= nlaedit_remove_meta_exec; @@ -683,9 +683,9 @@ static int nlaedit_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED void NLA_OT_duplicate (wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Strips"; + ot->name= _("Duplicate Strips"); ot->idname= "NLA_OT_duplicate"; - ot->description= "Duplicate selected NLA-Strips, adding the new strips in new tracks above the originals"; + ot->description= _("Duplicate selected NLA-Strips, adding the new strips in new tracks above the originals"); /* api callbacks */ ot->invoke= nlaedit_duplicate_invoke; @@ -696,7 +696,7 @@ void NLA_OT_duplicate (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ - RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); + RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); } /* ******************** Delete Strips Operator ***************************** */ @@ -758,9 +758,9 @@ static int nlaedit_delete_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Strips"; + ot->name= _("Delete Strips"); ot->idname= "NLA_OT_delete"; - ot->description= "Delete selected strips"; + ot->description= _("Delete selected strips"); /* api callbacks */ ot->exec= nlaedit_delete_exec; @@ -903,9 +903,9 @@ static int nlaedit_split_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_split (wmOperatorType *ot) { /* identifiers */ - ot->name= "Split Strips"; + ot->name= _("Split Strips"); ot->idname= "NLA_OT_split"; - ot->description= "Split selected strips at their midpoints"; + ot->description= _("Split selected strips at their midpoints"); /* api callbacks */ ot->exec= nlaedit_split_exec; @@ -956,9 +956,9 @@ static int nlaedit_bake_exec (bContext *C, wmOperator *UNUSED(op)) static void NLA_OT_bake (wmOperatorType *ot) { /* identifiers */ - ot->name= "Bake Strips"; + ot->name= _("Bake Strips"); ot->idname= "NLA_OT_bake"; - ot->description= "Bake all strips of selected AnimData blocks"; + ot->description= _("Bake all strips of selected AnimData blocks"); /* api callbacks */ ot->exec= nlaedit_bake_exec; @@ -1018,9 +1018,9 @@ static int nlaedit_toggle_mute_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_mute_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Muting"; + ot->name= _("Toggle Muting"); ot->idname= "NLA_OT_mute_toggle"; - ot->description= "Mute or un-mute selected strips"; + ot->description= _("Mute or un-mute selected strips"); /* api callbacks */ ot->exec= nlaedit_toggle_mute_exec; @@ -1176,9 +1176,9 @@ static int nlaedit_swap_exec (bContext *C, wmOperator *op) void NLA_OT_swap (wmOperatorType *ot) { /* identifiers */ - ot->name= "Swap Strips"; + ot->name= _("Swap Strips"); ot->idname= "NLA_OT_swap"; - ot->description= "Swap order of selected strips within tracks"; + ot->description= _("Swap order of selected strips within tracks"); /* api callbacks */ ot->exec= nlaedit_swap_exec; @@ -1250,9 +1250,9 @@ static int nlaedit_move_up_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_move_up (wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Strips Up"; + ot->name= _("Move Strips Up"); ot->idname= "NLA_OT_move_up"; - ot->description= "Move selected strips up a track if there's room"; + ot->description= _("Move selected strips up a track if there's room"); /* api callbacks */ ot->exec= nlaedit_move_up_exec; @@ -1324,9 +1324,9 @@ static int nlaedit_move_down_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_move_down (wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Strips Down"; + ot->name= _("Move Strips Down"); ot->idname= "NLA_OT_move_down"; - ot->description= "Move selected strips down a track if there's room"; + ot->description= _("Move selected strips down a track if there's room"); /* api callbacks */ ot->exec= nlaedit_move_down_exec; @@ -1400,9 +1400,9 @@ static int nlaedit_sync_actlen_exec (bContext *C, wmOperator *op) void NLA_OT_action_sync_length (wmOperatorType *ot) { /* identifiers */ - ot->name= "Sync Action Length"; + ot->name= _("Sync Action Length"); ot->idname= "NLA_OT_action_sync_length"; - ot->description= "Synchronise the length of the referenced Action with the lengths used in the strip"; + ot->description= _("Synchronise the length of the referenced Action with the lengths used in the strip"); /* api callbacks */ ot->exec= nlaedit_sync_actlen_exec; @@ -1500,9 +1500,9 @@ static int nlaedit_apply_scale_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_apply_scale (wmOperatorType *ot) { /* identifiers */ - ot->name= "Apply Scale"; + ot->name= _("Apply Scale"); ot->idname= "NLA_OT_apply_scale"; - ot->description= "Apply scaling of selected strips to their referenced Actions"; + ot->description= _("Apply scaling of selected strips to their referenced Actions"); /* api callbacks */ ot->exec= nlaedit_apply_scale_exec; @@ -1563,9 +1563,9 @@ static int nlaedit_clear_scale_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_clear_scale (wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Scale"; + ot->name= _("Clear Scale"); ot->idname= "NLA_OT_clear_scale"; - ot->description= "Reset scaling of selected strips"; + ot->description= _("Reset scaling of selected strips"); /* api callbacks */ ot->exec= nlaedit_clear_scale_exec; @@ -1580,10 +1580,10 @@ void NLA_OT_clear_scale (wmOperatorType *ot) /* defines for snap keyframes tool */ static EnumPropertyItem prop_nlaedit_snap_types[] = { - {NLAEDIT_SNAP_CFRA, "CFRA", 0, "Current frame", ""}, - {NLAEDIT_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, "Nearest Frame", ""}, // XXX as single entry? - {NLAEDIT_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, "Nearest Second", ""}, // XXX as single entry? - {NLAEDIT_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, "Nearest Marker", ""}, + {NLAEDIT_SNAP_CFRA, "CFRA", 0, N_("Current frame"), ""}, + {NLAEDIT_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, N_("Nearest Frame"), ""}, // XXX as single entry? + {NLAEDIT_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, N_("Nearest Second"), ""}, // XXX as single entry? + {NLAEDIT_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, N_("Nearest Marker"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -1704,9 +1704,9 @@ static int nlaedit_snap_exec (bContext *C, wmOperator *op) void NLA_OT_snap (wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap Strips"; + ot->name= _("Snap Strips"); ot->idname= "NLA_OT_snap"; - ot->description= "Move start of strips to specified time"; + ot->description= _("Move start of strips to specified time"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1717,7 +1717,7 @@ void NLA_OT_snap (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_nlaedit_snap_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_nlaedit_snap_types, 0, _("Type"), ""); } /* *********************************************** */ @@ -1819,9 +1819,9 @@ static int nla_fmodifier_add_exec(bContext *C, wmOperator *op) void NLA_OT_fmodifier_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add F-Modifier"; + ot->name= _("Add F-Modifier"); ot->idname= "NLA_OT_fmodifier_add"; - ot->description= "Add F-Modifier of the specified type to the selected NLA-Strips"; + ot->description= _("Add F-Modifier of the specified type to the selected NLA-Strips"); /* api callbacks */ ot->invoke= nla_fmodifier_add_invoke; @@ -1832,7 +1832,7 @@ void NLA_OT_fmodifier_add (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", fmodifier_type_items, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", fmodifier_type_items, 0, _("Type"), ""); RNA_def_boolean(ot->srna, "only_active", 0, _("Only Active"), _("Only add F-Modifier of the specified type to the active strip.")); } @@ -1883,9 +1883,9 @@ static int nla_fmodifier_copy_exec(bContext *C, wmOperator *op) void NLA_OT_fmodifier_copy (wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy F-Modifiers"; + ot->name= _("Copy F-Modifiers"); ot->idname= "NLA_OT_fmodifier_copy"; - ot->description= "Copy the F-Modifier(s) of the active NLA-Strip"; + ot->description= _("Copy the F-Modifier(s) of the active NLA-Strip"); /* api callbacks */ ot->exec= nla_fmodifier_copy_exec; @@ -1945,9 +1945,9 @@ static int nla_fmodifier_paste_exec(bContext *C, wmOperator *op) void NLA_OT_fmodifier_paste (wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste F-Modifiers"; + ot->name= _("Paste F-Modifiers"); ot->idname= "NLA_OT_fmodifier_paste"; - ot->description= "Add copied F-Modifiers to the selected NLA-Strips"; + ot->description= _("Add copied F-Modifiers to the selected NLA-Strips"); /* api callbacks */ ot->exec= nla_fmodifier_paste_exec; diff --git a/source/blender/editors/space_nla/nla_select.c b/source/blender/editors/space_nla/nla_select.c index 0bd96e510c1..d8f27c9399b 100644 --- a/source/blender/editors/space_nla/nla_select.c +++ b/source/blender/editors/space_nla/nla_select.c @@ -189,9 +189,9 @@ static int nlaedit_deselectall_exec(bContext *C, wmOperator *op) void NLA_OT_select_all_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; + ot->name= _("Select or Deselect All"); ot->idname= "NLA_OT_select_all_toggle"; - ot->description= "(De)Select all NLA-Strips"; + ot->description= _("(De)Select all NLA-Strips"); /* api callbacks */ ot->exec= nlaedit_deselectall_exec; @@ -327,9 +327,9 @@ static int nlaedit_borderselect_exec(bContext *C, wmOperator *op) void NLA_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; + ot->name= _("Border Select"); ot->idname= "NLA_OT_select_border"; - ot->description= "Use box selection to grab NLA-Strips"; + ot->description= _("Use box selection to grab NLA-Strips"); /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -353,9 +353,9 @@ void NLA_OT_select_border(wmOperatorType *ot) /* defines for left-right select tool */ static EnumPropertyItem prop_nlaedit_leftright_select_types[] = { - {NLAEDIT_LRSEL_TEST, "CHECK", 0, "Check if Select Left or Right", ""}, - {NLAEDIT_LRSEL_LEFT, "LEFT", 0, "Before current frame", ""}, - {NLAEDIT_LRSEL_RIGHT, "RIGHT", 0, "After current frame", ""}, + {NLAEDIT_LRSEL_TEST, "CHECK", 0, N_("Check if Select Left or Right"), ""}, + {NLAEDIT_LRSEL_LEFT, "LEFT", 0, N_("Before current frame"), ""}, + {NLAEDIT_LRSEL_RIGHT, "RIGHT", 0, N_("After current frame"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -479,9 +479,9 @@ static int nlaedit_select_leftright_invoke (bContext *C, wmOperator *op, wmEvent void NLA_OT_select_leftright (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Left/Right"; + ot->name= _("Select Left/Right"); ot->idname= "NLA_OT_select_leftright"; - ot->description= "Select strips to the left or the right of the current frame "; + ot->description= _("Select strips to the left or the right of the current frame "); /* api callbacks */ ot->invoke= nlaedit_select_leftright_invoke; @@ -492,7 +492,7 @@ void NLA_OT_select_leftright (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "mode", prop_nlaedit_leftright_select_types, NLAEDIT_LRSEL_TEST, "Mode", ""); + ot->prop= RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(prop_nlaedit_leftright_select_types), NLAEDIT_LRSEL_TEST, _("Mode"), ""); RNA_def_boolean(ot->srna, "extend", 0, _("Extend Select"), ""); } @@ -640,9 +640,9 @@ static int nlaedit_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even void NLA_OT_click_select (wmOperatorType *ot) { /* identifiers */ - ot->name= "Mouse Select"; + ot->name= _("Mouse Select"); ot->idname= "NLA_OT_click_select"; - ot->description= "Handle clicks to select NLA Strips"; + ot->description= _("Handle clicks to select NLA Strips"); /* api callbacks - absolutely no exec() this yet... */ ot->invoke= nlaedit_clickselect_invoke; -- cgit v1.2.3