diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-20 11:39:25 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-20 11:39:25 +0400 |
commit | 6d125e159d2c391fd92d20bd29bc5c8c33b7dcc2 (patch) | |
tree | 408d10d9a473158cf49812a0a229cb51e18ba7b7 /source/blender/editors | |
parent | 0e421f429ab9c6a6d041c7feb52e84826abe6c65 (diff) |
i18n: code clean-up
- Move all translation-related declarations to BLF_translation.h
- Reverted some changes to match trunk svn rev40365
Diffstat (limited to 'source/blender/editors')
20 files changed, 25 insertions, 18 deletions
diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c index 5acd63f836d..8a7d837d2a8 100644 --- a/source/blender/editors/armature/poselib.c +++ b/source/blender/editors/armature/poselib.c @@ -43,7 +43,7 @@ #include "BLI_dlrbTree.h" #include "BLI_utildefines.h" -#include "BLF_api.h" +#include "BLF_translation.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index a49de18002a..a850fa993f0 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -55,6 +55,7 @@ #include "BIF_gl.h" #include "BLF_api.h" +#include "BLF_translation.h" #include "UI_interface.h" diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 3e4f34aff0e..3c02f7d4bd2 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -43,7 +43,7 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BLF_api.h" +#include "BLF_translation.h" #include "BKE_context.h" #include "BKE_global.h" @@ -2808,7 +2808,7 @@ void uiLayoutOperatorButs(const bContext *C, uiLayout *layout, wmOperator *op,in empty= uiDefAutoButsRNA(layout, &ptr, check_prop, label_align) == 0; if(empty && (flag & UI_LAYOUT_OP_SHOW_EMPTY)) { - uiItemL(layout, _("No Properties"), ICON_NONE); + uiItemL(layout, UI_translate_do_iface(N_("No Properties")), ICON_NONE); } } diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index d6ea5c926db..ec7456eebdc 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -53,8 +53,6 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "BLF_api.h" - #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index fb63af5823f..4221f7c30ff 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -62,6 +62,7 @@ #include "UI_view2d.h" #include "BLF_api.h" +#include "BLF_translation.h" #include "ED_screen.h" diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c index d242da8e480..5ea20b33b3a 100644 --- a/source/blender/editors/interface/interface_style.c +++ b/source/blender/editors/interface/interface_style.c @@ -44,10 +44,10 @@ #include "BLI_string.h" #include "BKE_global.h" -#include "BKE_font.h" #include "BLF_api.h" +#include "BLF_translation.h" #include "UI_interface.h" @@ -324,7 +324,7 @@ void uiStyleInit(void) if(font->uifont_id==UIFONT_DEFAULT) { #ifdef INTERNATIONAL int unifont_size; - unsigned char *unifont_ttf= BKE_font_get_unifont(&unifont_size); + unsigned char *unifont_ttf= BLF_get_unifont(&unifont_size); if(unifont_ttf) font->blf_id= BLF_load_mem_unique("default", unifont_ttf, unifont_size); diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 7335d13079a..095c90797f1 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -68,6 +68,7 @@ #include "interface_intern.h" #include "BLF_api.h" +#include "BLF_translation.h" void UI_template_fix_linking(void) { diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c index 54aef0729a8..a49060eaca2 100644 --- a/source/blender/editors/interface/interface_utils.c +++ b/source/blender/editors/interface/interface_utils.c @@ -37,7 +37,7 @@ #include "BLI_utildefines.h" -#include "BLF_api.h" +#include "BLF_translation.h" #include "BKE_context.h" diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index d9a5e92a72c..45829646145 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1018,6 +1018,7 @@ static void ui_text_label_rightclip(uiFontStyle *fstyle, uiBut *but, rcti *rect) static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *but, rcti *rect) { +// int transopts; char *cpoin = NULL; /* for underline drawing */ @@ -1087,6 +1088,10 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b if (fstyle->kerning == 1) BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT); + // ui_rasterpos_safe(x, y, but->aspect); +// if(but->type==IDPOIN) transopts= 0; // no translation, of course! +// else transopts= ui_translate_buttons(); + /* cut string in 2 parts - only for menu entries */ if((but->block->flag & UI_BLOCK_LOOP)) { if(ELEM5(but->type, SLI, NUM, TEX, NUMSLI, NUMABS)==0) { diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index c7e7cc35c8e..8951df9221e 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -43,7 +43,7 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLF_api.h" +#include "BLF_translation.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c index 0f4467975d1..b18b5373240 100644 --- a/source/blender/editors/space_buttons/buttons_header.c +++ b/source/blender/editors/space_buttons/buttons_header.c @@ -37,7 +37,7 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" +#include "BLF_translation.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index 2d00a08662a..b2b734159ff 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -50,6 +50,7 @@ #include "BKE_main.h" #include "BLF_api.h" +#include "BLF_translation.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/space_file/file_panels.c b/source/blender/editors/space_file/file_panels.c index 0741152f0ab..37dce293d77 100644 --- a/source/blender/editors/space_file/file_panels.c +++ b/source/blender/editors/space_file/file_panels.c @@ -37,7 +37,7 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" +#include "BLF_translation.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index 766ff3d118c..28fd1cd3304 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -46,7 +46,7 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLF_api.h" +#include "BLF_translation.h" #include "BKE_context.h" #include "BKE_depsgraph.h" diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c index 404d7d241f1..75e13b24ede 100644 --- a/source/blender/editors/space_info/space_info.c +++ b/source/blender/editors/space_info/space_info.c @@ -41,7 +41,7 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLF_api.h" +#include "BLF_translation.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 55eff4defe3..5e1f2745559 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -45,7 +45,7 @@ #include "BLI_editVert.h" #include "BLI_rand.h" -#include "BLF_api.h" +#include "BLF_translation.h" #include "BKE_nla.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_node/node_header.c b/source/blender/editors/space_node/node_header.c index f4713ecaf13..996e05afdef 100644 --- a/source/blender/editors/space_node/node_header.c +++ b/source/blender/editors/space_node/node_header.c @@ -44,7 +44,7 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" +#include "BLF_translation.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 6dd4103dc6d..22146a22b9b 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -47,7 +47,7 @@ #include "BLI_editVert.h" #include "BLI_utildefines.h" -#include "BLF_api.h" +#include "BLF_translation.h" #include "BKE_context.h" #include "BKE_depsgraph.h" diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c index ad338cef207..ddea89e1cdb 100644 --- a/source/blender/editors/space_view3d/view3d_toolbar.c +++ b/source/blender/editors/space_view3d/view3d_toolbar.c @@ -48,7 +48,7 @@ #include "BLI_utildefines.h" #include "BLI_ghash.h" -#include "BLF_api.h" +#include "BLF_translation.h" #include "BKE_context.h" #include "BKE_idprop.h" diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 3daede5f785..3ee4c30192e 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -50,7 +50,7 @@ #include "BLI_editVert.h" #include "BLI_utildefines.h" -#include "BLF_api.h" +#include "BLF_translation.h" //#include "BIF_editmesh.h" //#include "BIF_interface.h" |