bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

remove blf.gettext, add blf.unload(font)

Browse Source
This commit is contained in:
Campbell Barton 2011-09-21 16:06:47 +00:00
parent f4c56a879d
commit 280684c35d
1 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
source/blender/python/generic/blf_py_api.c
View File

@ -31,15 +31,9 @@
#include "blf_py_api.h" #include "blf_py_api.h"
#include "../../blenfont/BLF_api.h" #include "../../blenfont/BLF_api.h"
#include "../../blenfont/BLF_translation.h"
#include "BLI_utildefines.h" #include "BLI_utildefines.h"
#ifdef INTERNATIONAL
#include "DNA_userdef_types.h" /* is it bad level? */
#endif
PyDoc_STRVAR(py_blf_position_doc, PyDoc_STRVAR(py_blf_position_doc,
".. function:: position(fontid, x, y, z)\n" ".. function:: position(fontid, x, y, z)\n"
"\n" "\n"
@ -371,33 +365,24 @@ static PyObject *py_blf_load(PyObject *UNUSED(self), PyObject *args)
return PyLong_FromLong(BLF_load(filename)); return PyLong_FromLong(BLF_load(filename));
} }
PyDoc_STRVAR(py_blf_gettext_doc, PyDoc_STRVAR(py_blf_unload_doc,
".. function:: gettext(msgid)\n" ".. function:: unload(filename)\n"
"\n" "\n"
" Get a msg in local language.\n" " Unload an existing font.\n"
"\n" "\n"
" :arg msgid: the source string.\n" " :arg filename: the filename of the font.\n"
" :type msgid: string\n" " :type filename: string\n"
" :return: the localized string.\n"
" :rtype: string\n"
); );
static PyObject *py_blf_gettext(PyObject *UNUSED(self), PyObject *value) static PyObject *py_blf_unload(PyObject *UNUSED(self), PyObject *args)
{ {
#ifdef INTERNATIONAL char* filename;
if ((U.transopts & USER_DOTRANSLATE) && (U.transopts & USER_TR_IFACE)) {
const char *msgid= _PyUnicode_AsString(value);
if(msgid == NULL) {
PyErr_SetString(PyExc_TypeError, "blf.gettext expects a single string argument");
return NULL;
}
return PyUnicode_FromString(BLF_gettext(msgid)); if (!PyArg_ParseTuple(args, "s:blf.unload", &filename))
} return NULL;
else
#endif /* INTERNATIONAL */ BLF_unload(filename);
{
return Py_INCREF(value), value; Py_RETURN_NONE;
}
} }
/*----------------------------MODULE INIT-------------------------*/ /*----------------------------MODULE INIT-------------------------*/
@ -415,7 +400,7 @@ static PyMethodDef BLF_methods[] = {
{"shadow_offset", (PyCFunction) py_blf_shadow_offset, METH_VARARGS, py_blf_shadow_offset_doc}, {"shadow_offset", (PyCFunction) py_blf_shadow_offset, METH_VARARGS, py_blf_shadow_offset_doc},
{"size", (PyCFunction) py_blf_size, METH_VARARGS, py_blf_size_doc}, {"size", (PyCFunction) py_blf_size, METH_VARARGS, py_blf_size_doc},
{"load", (PyCFunction) py_blf_load, METH_VARARGS, py_blf_load_doc}, {"load", (PyCFunction) py_blf_load, METH_VARARGS, py_blf_load_doc},
{"gettext", (PyCFunction) py_blf_gettext, METH_O, py_blf_gettext_doc}, {"unload", (PyCFunction) py_blf_unload, METH_VARARGS, py_blf_unload_doc},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };