summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-25 16:12:28 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-26 17:58:07 +0900
commitc9f51e450b33e3ba6d5c66434f9fb38081b0efb7 (patch)
tree29096af891ac88b8813d86c49a5e79702face783
parent5f96c6fb4b09e45b5de18d7c8cb6a28fca8a489a (diff)
downloadefl-c9f51e450b33e3ba6d5c66434f9fb38081b0efb7.tar.gz
widget: Fix translation of default text parts
Note: fileselector uses this translation API Ref T5363
-rw-r--r--src/lib/elementary/efl_ui_button.eo3
-rw-r--r--src/lib/elementary/efl_ui_frame.eo4
-rw-r--r--src/lib/elementary/efl_ui_slider.eo3
-rw-r--r--src/lib/elementary/elm_notify.c15
-rw-r--r--src/lib/elementary/elm_notify_part.eo4
-rw-r--r--src/lib/elementary/elm_part_helper.h10
6 files changed, 35 insertions, 4 deletions
diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo
index 1065d14b3d..021c8229b2 100644
--- a/src/lib/elementary/efl_ui_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -1,5 +1,5 @@
class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text,
- Elm.Interface.Atspi_Widget_Action)
+ Elm.Interface.Atspi_Widget_Action, Efl.Ui.Translatable)
{
[[Push-button widget
@@ -25,5 +25,6 @@ class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Tex
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
Efl.Part.part;
Efl.Text.text { get; set; }
+ Efl.Ui.Translatable.translatable_text { get; set; }
}
}
diff --git a/src/lib/elementary/efl_ui_frame.eo b/src/lib/elementary/efl_ui_frame.eo
index 7983c81f0a..21e305c458 100644
--- a/src/lib/elementary/efl_ui_frame.eo
+++ b/src/lib/elementary/efl_ui_frame.eo
@@ -1,4 +1,5 @@
-class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text)
+class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text,
+ Efl.Ui.Translatable)
{
[[Frame widget
@@ -61,5 +62,6 @@ class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text)
Elm.Widget.focus_next;
Elm.Widget.focus_direction_manager_is;
Efl.Text.text { get; set; }
+ Efl.Ui.Translatable.translatable_text { get; set; }
}
}
diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo
index c26ab11b3e..0e7d21a153 100644
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -2,7 +2,7 @@ type slider_func_type: __undefined_type; [[Elementary slider function type]]
type slider_freefunc_type: __undefined_type; [[Elementary slider free function type]]
class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction,
- Efl.Access.Value, Efl.Text,
+ Efl.Access.Value, Efl.Text, Efl.Ui.Translatable,
Elm.Interface.Atspi_Widget_Action)
{
[[Elementary slider class]]
@@ -130,6 +130,7 @@ class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction,
Efl.Access.Value.increment { get; }
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
Efl.Text.text { get; set; }
+ Efl.Ui.Translatable.translatable_text { get; set; }
}
events {
changed; [[Called when slider changed]]
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index f4f97dcd01..1a71e67227 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -747,6 +747,21 @@ ELM_PART_OVERRIDE_CONTENT_SET(elm_notify, ELM_NOTIFY, Elm_Notify_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_notify, ELM_NOTIFY, Elm_Notify_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_notify, ELM_NOTIFY, Elm_Notify_Data)
ELM_PART_CONTENT_DEFAULT_SET(elm_notify, "default")
+
+EOLIAN static const char *
+_elm_notify_part_efl_ui_translatable_translatable_text_get(Eo *obj, void *_pd EINA_UNUSED, const char **domain)
+{
+ Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
+ return elm_widget_part_translatable_text_get(pd->obj, pd->part, domain);
+}
+
+EOLIAN static void
+_elm_notify_part_efl_ui_translatable_translatable_text_set(Eo *obj, void *_pd EINA_UNUSED, const char *label, const char *domain)
+{
+ Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
+ elm_widget_part_translatable_text_set(pd->obj, pd->part, label, domain);
+}
+
#include "elm_notify_part.eo.c"
/* Efl.Part end */
diff --git a/src/lib/elementary/elm_notify_part.eo b/src/lib/elementary/elm_notify_part.eo
index 536d3b1cb1..40339b9e2c 100644
--- a/src/lib/elementary/elm_notify_part.eo
+++ b/src/lib/elementary/elm_notify_part.eo
@@ -1,9 +1,11 @@
-class Elm.Notify.Part (Efl.Ui.Widget.Part, Efl.Container, Efl.Text)
+class Elm.Notify.Part (Efl.Ui.Widget.Part, Efl.Container, Efl.Text,
+ Efl.Ui.Translatable)
{
[[Elementary notification internel part class]]
data: null;
implements {
Efl.Text.text { get; set; }
+ Efl.Ui.Translatable.translatable_text { get; set; }
Efl.Container.content { get; set; }
Efl.Container.content_unset;
}
diff --git a/src/lib/elementary/elm_part_helper.h b/src/lib/elementary/elm_part_helper.h
index 08612ff1df..bf84b5710a 100644
--- a/src/lib/elementary/elm_part_helper.h
+++ b/src/lib/elementary/elm_part_helper.h
@@ -150,6 +150,16 @@ EOLIAN static const char * \
_ ## type ## _efl_text_text_get(Eo *obj, Type *pd EINA_UNUSED) \
{ \
return efl_text_get(efl_part(efl_super(obj, MY_CLASS), "elm.text")); \
+} \
+EOLIAN static void \
+_ ## type ## _efl_ui_translatable_translatable_text_set(Eo *obj, Type *pd EINA_UNUSED, const char *label, const char *domain) \
+{ \
+ efl_ui_translatable_text_set(efl_part(efl_super(obj, MY_CLASS), "elm.text"), label, domain); \
+} \
+EOLIAN static const char * \
+_ ## type ## _efl_ui_translatable_translatable_text_get(Eo *obj, Type *pd EINA_UNUSED, const char **domain) \
+{ \
+ return efl_ui_translatable_text_get(efl_part(efl_super(obj, MY_CLASS), "elm.text"), domain); \
}
#endif