From f8d00ae0f2a8aa1c5fc4d34eda4925fc3566c378 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Thu, 23 Jan 2014 20:20:43 +0900 Subject: [PATCH] elementary - override widget translation but work also the base widget's behavior. Some widgets override the widget translation but it didn't inherit the base widget's function. Becuase of it,The language changed won't be properly called in the widget tree. Now it fixed it. --- legacy/elementary/src/lib/elc_ctxpopup.c | 2 ++ legacy/elementary/src/lib/elc_hoversel.c | 2 ++ legacy/elementary/src/lib/elc_multibuttonentry.c | 2 ++ legacy/elementary/src/lib/elc_naviframe.c | 2 ++ legacy/elementary/src/lib/elc_popup.c | 2 ++ legacy/elementary/src/lib/elm_datetime.c | 2 ++ legacy/elementary/src/lib/elm_dayselector.c | 2 ++ legacy/elementary/src/lib/elm_list.c | 2 ++ legacy/elementary/src/lib/elm_segment_control.c | 2 ++ legacy/elementary/src/lib/elm_toolbar.c | 2 ++ 10 files changed, 20 insertions(+) diff --git a/legacy/elementary/src/lib/elc_ctxpopup.c b/legacy/elementary/src/lib/elc_ctxpopup.c index 4f65e49736..1109bb1272 100644 --- a/legacy/elementary/src/lib/elc_ctxpopup.c +++ b/legacy/elementary/src/lib/elc_ctxpopup.c @@ -43,6 +43,8 @@ _elm_ctxpopup_smart_translate(Eo *obj, void *_pd, va_list *list) EINA_LIST_FOREACH(sd->items, l, it) elm_widget_item_translate(it); + eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + if (ret) *ret = EINA_TRUE; } diff --git a/legacy/elementary/src/lib/elc_hoversel.c b/legacy/elementary/src/lib/elc_hoversel.c index 462c34fe33..91fe2dd569 100644 --- a/legacy/elementary/src/lib/elc_hoversel.c +++ b/legacy/elementary/src/lib/elc_hoversel.c @@ -36,6 +36,8 @@ _elm_hoversel_smart_translate(Eo *obj EINA_UNUSED, void *_pd, va_list *list) EINA_LIST_FOREACH(sd->items, l, it) elm_widget_item_translate(it); + eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + if (ret) *ret = EINA_TRUE; } diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c index c89e2feee0..aca1793efc 100644 --- a/legacy/elementary/src/lib/elc_multibuttonentry.c +++ b/legacy/elementary/src/lib/elc_multibuttonentry.c @@ -52,6 +52,8 @@ _elm_multibuttonentry_smart_translate(Eo *obj EINA_UNUSED, void *_pd, va_list *l EINA_LIST_FOREACH(sd->items, l, it) elm_widget_item_translate(it); + eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + if (ret) *ret = EINA_TRUE; } diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index 3c1ed672d0..2b604e5018 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -78,6 +78,8 @@ _elm_naviframe_smart_translate(Eo *obj EINA_UNUSED, void *_pd, va_list *list) EINA_INLIST_FOREACH(sd->stack, it) elm_widget_item_translate(it); + eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + if (ret) *ret = EINA_TRUE; } diff --git a/legacy/elementary/src/lib/elc_popup.c b/legacy/elementary/src/lib/elc_popup.c index 9ca911e9c1..ecd724f285 100644 --- a/legacy/elementary/src/lib/elc_popup.c +++ b/legacy/elementary/src/lib/elc_popup.c @@ -46,6 +46,8 @@ _elm_popup_smart_translate(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list * EINA_LIST_FOREACH(sd->items, l, it) elm_widget_item_translate(it); + eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + if (ret) *ret = EINA_TRUE; } diff --git a/legacy/elementary/src/lib/elm_datetime.c b/legacy/elementary/src/lib/elm_datetime.c index d00f954af9..bb5ede9283 100644 --- a/legacy/elementary/src/lib/elm_datetime.c +++ b/legacy/elementary/src/lib/elm_datetime.c @@ -372,6 +372,8 @@ _elm_datetime_smart_translate(Eo *obj, void *_pd, va_list *list) if (!sd->user_format) _reload_format(obj); else _field_list_display(obj); + eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + if (ret) *ret = EINA_TRUE; } diff --git a/legacy/elementary/src/lib/elm_dayselector.c b/legacy/elementary/src/lib/elm_dayselector.c index 62482006cf..8f3287d0b1 100644 --- a/legacy/elementary/src/lib/elm_dayselector.c +++ b/legacy/elementary/src/lib/elm_dayselector.c @@ -78,6 +78,8 @@ _elm_dayselector_smart_translate(Eo *obj EINA_UNUSED, void *_pd, va_list *list) elm_object_text_set(VIEW(it), buf); } + eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + exit: if (ret) *ret = EINA_TRUE; } diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c index 304d24ba70..08055afaa1 100644 --- a/legacy/elementary/src/lib/elm_list.c +++ b/legacy/elementary/src/lib/elm_list.c @@ -446,6 +446,8 @@ _elm_list_smart_translate(Eo *obj EINA_UNUSED, void *_pd, va_list *list) EINA_LIST_FOREACH(sd->items, l, it) elm_widget_item_translate(it); + eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + if (ret) *ret = EINA_TRUE; } diff --git a/legacy/elementary/src/lib/elm_segment_control.c b/legacy/elementary/src/lib/elm_segment_control.c index 7c624d5f32..858cc01a44 100644 --- a/legacy/elementary/src/lib/elm_segment_control.c +++ b/legacy/elementary/src/lib/elm_segment_control.c @@ -32,6 +32,8 @@ _elm_segment_control_smart_translate(Eo *obj EINA_UNUSED, void *_pd, va_list *li EINA_LIST_FOREACH(sd->items, l, it) elm_widget_item_translate(it); + eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + if (ret) *ret = EINA_TRUE; } diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c index 86afd022fe..0d766a607e 100644 --- a/legacy/elementary/src/lib/elm_toolbar.c +++ b/legacy/elementary/src/lib/elm_toolbar.c @@ -1392,6 +1392,8 @@ _elm_toolbar_smart_translate(Eo *obj EINA_UNUSED, void *_pd, va_list *list) EINA_INLIST_FOREACH(sd->items, it) elm_widget_item_translate(it); + eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + if (ret) *ret = EINA_TRUE; }