From 2762222fcc127c95e0d82ff268c241325867171f Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Fri, 25 Jan 2019 16:19:50 +0100 Subject: [PATCH] rename multi-lang functions --- lv_objx/lv_img.c | 8 ++++---- lv_objx/lv_img.h | 6 +++--- lv_objx/lv_label.c | 4 ++-- lv_objx/lv_label.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lv_objx/lv_img.c b/lv_objx/lv_img.c index cd03cb297..ffb5f1efe 100644 --- a/lv_objx/lv_img.c +++ b/lv_objx/lv_img.c @@ -207,20 +207,20 @@ void lv_img_set_src(lv_obj_t * img, const void * src_img) } /** - * Set an ID which means a the same source but on different languages + * Set an ID which means a the same source but in different languages * @param img pointer to an image object * @param src_id ID of the source */ -void lv_img_set_src_multi(lv_obj_t * img, uint32_t txt_id) +void lv_img_set_src_id(lv_obj_t * img, uint32_t src_id) { #if USE_LV_MULTI_LANG lv_img_ext_t * ext = lv_obj_get_ext_attr(img); - ext->lang_txt_id = txt_id; + ext->lang_txt_id = lv_img_set_src_id; /*Apply the new language*/ img->signal_func(img, LV_SIGNAL_LANG_CHG, NULL); #else - LV_LOG_WARN("lv_img_set_src_multi: multiple languages are not enabled. See lv_conf.h USE_LV_MULTI_LANG ") + LV_LOG_WARN("lv_img_set_src_id: multiple languages are not enabled. See lv_conf.h USE_LV_MULTI_LANG ") #endif } diff --git a/lv_objx/lv_img.h b/lv_objx/lv_img.h index 36222f975..20766b74a 100644 --- a/lv_objx/lv_img.h +++ b/lv_objx/lv_img.h @@ -79,7 +79,7 @@ void lv_img_set_src(lv_obj_t * img, const void * src_img); * @param img pointer to an image object * @param src_id ID of the source */ -void lv_img_set_src_multi(lv_obj_t * img, uint32_t txt_id); +void lv_img_set_src_id(lv_obj_t * img, uint32_t txt_id); /** @@ -95,11 +95,11 @@ static inline void lv_img_set_file(lv_obj_t * img, const char * fn) } /** - * Set an ID which means a the same source but on different languages + * Set an ID which means a the same source but in different languages * @param img pointer to an image object * @param src_id ID of the source */ -void lv_img_set_src_multi(lv_obj_t * img, uint32_t txt_id); +void lv_img_set_src_id(lv_obj_t * img, uint32_t src_id); /** * Enable the auto size feature. diff --git a/lv_objx/lv_label.c b/lv_objx/lv_label.c index d4ef98f6e..8e04e93e8 100644 --- a/lv_objx/lv_label.c +++ b/lv_objx/lv_label.c @@ -238,11 +238,11 @@ void lv_label_set_static_text(lv_obj_t * label, const char * text) } /** - *Set a text ID which means a the same text but on different languages + *Set a text ID which refers a the same text but in a different languages * @param label pointer to a label object * @param txt_id ID of the text */ -void lv_label_set_text_lang(lv_obj_t * label, uint32_t txt_id) +void lv_label_set_text_id(lv_obj_t * label, uint32_t txt_id) { #if USE_LV_MULTI_LANG lv_label_ext_t * ext = lv_obj_get_ext_attr(label); diff --git a/lv_objx/lv_label.h b/lv_objx/lv_label.h index 7be7cd6a2..7999071cf 100644 --- a/lv_objx/lv_label.h +++ b/lv_objx/lv_label.h @@ -128,7 +128,7 @@ void lv_label_set_static_text(lv_obj_t * label, const char * text); * @param label pointer to a label object * @param txt_id ID of the text */ -void lv_label_set_text_lang(lv_obj_t * label, uint32_t txt_id); +void lv_label_set_text_id(lv_obj_t * label, uint32_t txt_id); /** * Set the behavior of the label with longer text then the object size