elementary: add circle to wearable class names

To avoid same class names, circle is added to the wearable class names.

Change-Id: Iace92716869aa1f92d43a2d3176d20904e937f7b

diff --git a/src/lib/elementary/Efl_Wearable.h b/src/lib/elementary/Efl_Wearable.h
index 1e5adad..460beec 100644 (file)
--- a/src/lib/elementary/Efl_Wearable.h
+++ b/src/lib/elementary/Efl_Wearable.h
@@ -1,7 +1,7 @@
 #include "efl_wearable_position_manager_circle_list.eo.h"
-#include "efl_wearable_item.eo.h"
-#include "efl_wearable_default_item.eo.h"
-#include "efl_wearable_list_default_item.eo.h"
-#include "efl_wearable_placeholder_item.eo.h"
-#include "efl_wearable_title_item.eo.h"
-#include "efl_wearable_double_text_item.eo.h"
+#include "efl_wearable_circle_item.eo.h"
+#include "efl_wearable_circle_default_item.eo.h"
+#include "efl_wearable_circle_list_default_item.eo.h"
+#include "efl_wearable_circle_placeholder_item.eo.h"
+#include "efl_wearable_circle_title_item.eo.h"
+#include "efl_wearable_circle_double_text_item.eo.h"

diff --git a/src/lib/elementary/efl_wearable_circle_default_item.c b/src/lib/elementary/efl_wearable_circle_default_item.c
new file mode 100644 (file)
index 0000000..3a7db9a
--- /dev/null
+++ b/src/lib/elementary/efl_wearable_circle_default_item.c
@@ -0,0 +1,44 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+
+#define EFL_WEARABLE_CIRCLE_LIST_DEFAULT_ITEM_PROTECTED
+#define EFL_PART_PROTECTED
+
+#include <Elementary.h>
+#include "Efl_Wearable.h"
+
+#include "elm_priv.h"
+#include "elm_part_helper.h"
+
+#define MY_CLASS EFL_WEARABLE_CIRCLE_DEFAULT_ITEM_CLASS
+#define MY_CLASS_PFX  efl_wearable_circle_default_item
+
+#define MY_CLASS_NAME "Efl.Wearable.Circle_Default_Item"
+
+ELM_PART_TEXT_DEFAULT_GET(efl_wearable_circle_default_item, "efl.text")
+ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_wearable_circle_default_item, void)
+ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_wearable_circle_default_item, void)
+ELM_PART_CONTENT_DEFAULT_GET(efl_wearable_circle_default_item, "efl.icon")
+ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_wearable_circle_default_item, void)
+
+EOLIAN static Efl_Object *
+_efl_wearable_circle_default_item_efl_part_part_get(const Eo *obj, void *pd EINA_UNUSED, const char *part)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
+   if (eina_streq(part, "text"))
+     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_TEXT_CLASS, obj, "efl.text");
+   else if (eina_streq(part, "icon"))
+     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_CONTENT_CLASS, obj, "efl.icon");
+   else if (eina_streq(part, "extra"))
+     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_CONTENT_CLASS, obj, "efl.extra");
+
+   return efl_part_get(efl_super(obj, MY_CLASS), part);
+}
+
+
+#define EFL_WEARABLE_CIRCLE_DEFAULT_ITEM_EXTRA_OPS             \
+  ELM_PART_TEXT_DEFAULT_OPS(efl_wearable_circle_default_item), \
+  ELM_PART_CONTENT_DEFAULT_OPS(efl_wearable_circle_default_item)
+
+#include "efl_wearable_circle_default_item.eo.c"

diff --git a/src/lib/elementary/efl_wearable_default_item.eo b/src/lib/elementary/efl_wearable_circle_default_item.eo
similarity index 75%
rename from src/lib/elementary/efl_wearable_default_item.eo
rename to src/lib/elementary/efl_wearable_circle_default_item.eo
index 46c3554..366fdb4 100644 (file)
--- a/src/lib/elementary/efl_wearable_default_item.eo
+++ b/src/lib/elementary/efl_wearable_circle_default_item.eo
@@ -1,10 +1,10 @@
-abstract Efl.Wearable.Default_Item extends Efl.Wearable.Item implements
-                                           Efl.Text,
-                                           Efl.Text_Markup,
-                                           Efl.Ui.L10n,
-                                           Efl.Content
+abstract Efl.Wearable.Circle_Default_Item extends Efl.Wearable.Circle_Item implements
+                                                  Efl.Text,
+                                                  Efl.Text_Markup,
+                                                  Efl.Ui.L10n,
+                                                  Efl.Content
 {
-   [[Wearable Default Item Class.
+   [[Wearable Circle Default Item Class.
 
      This class defines the standard parts for most @Efl.Ui.Item: Text, Icon and Extra.
      Placement and layout details for these parts are left to the extending classes like

diff --git a/src/lib/elementary/efl_wearable_circle_double_text_item.c b/src/lib/elementary/efl_wearable_circle_double_text_item.c
new file mode 100644 (file)
index 0000000..5b6c389
--- /dev/null
+++ b/src/lib/elementary/efl_wearable_circle_double_text_item.c
@@ -0,0 +1,55 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+
+#define EFL_WEARABLE_CIRCLE_DOUBLE_TEXT_ITEM_PROTECTED
+#define EFL_PART_PROTECTED
+
+#include <Elementary.h>
+#include "Efl_Wearable.h"
+
+#include "elm_priv.h"
+#include "elm_part_helper.h"
+
+#define MY_CLASS EFL_WEARABLE_CIRCLE_DOUBLE_TEXT_ITEM_CLASS
+#define MY_CLASS_PFX  efl_wearable_circle_double_text_item
+
+#define MY_CLASS_NAME "Efl.Wearable.Circle_Double_Text_Item"
+
+ELM_PART_TEXT_DEFAULT_GET(efl_wearable_circle_double_text_item, "efl.text")
+ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_wearable_circle_double_text_item, void)
+ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_wearable_circle_double_text_item, void)
+ELM_PART_CONTENT_DEFAULT_GET(efl_wearable_circle_double_text_item, "efl.icon")
+ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_wearable_circle_double_text_item, void)
+
+EOLIAN static Efl_Object *
+_efl_wearable_circle_double_text_item_efl_part_part_get(const Eo *obj, void *pd EINA_UNUSED, const char *part)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
+   if (eina_streq(part, "text"))
+     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_TEXT_CLASS, obj, "efl.text");
+   if (eina_streq(part, "sub_text"))
+     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_TEXT_CLASS, obj, "efl.sub_text");
+   else if (eina_streq(part, "icon"))
+     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_CONTENT_CLASS, obj, "efl.icon");
+   else if (eina_streq(part, "extra"))
+     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_CONTENT_CLASS, obj, "efl.extra");
+
+   return efl_part_get(efl_super(obj, MY_CLASS), part);
+}
+
+EOLIAN static Efl_Object *
+_efl_wearable_circle_double_text_item_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
+{
+   Eo *eo;
+
+   eo = efl_constructor(efl_super(obj, MY_CLASS));
+   elm_widget_theme_element_set(obj, "double_text");
+   return eo;
+}
+
+#define EFL_WEARABLE_CIRCLE_DOUBLE_TEXT_ITEM_EXTRA_OPS             \
+  ELM_PART_TEXT_DEFAULT_OPS(efl_wearable_circle_double_text_item), \
+  ELM_PART_CONTENT_DEFAULT_OPS(efl_wearable_circle_double_text_item)
+
+#include "efl_wearable_circle_double_text_item.eo.c"

diff --git a/src/lib/elementary/efl_wearable_double_text_item.eo b/src/lib/elementary/efl_wearable_circle_double_text_item.eo
similarity index 71%
rename from src/lib/elementary/efl_wearable_double_text_item.eo
rename to src/lib/elementary/efl_wearable_circle_double_text_item.eo
index 5b1a26b..a96c9b9 100644 (file)
--- a/src/lib/elementary/efl_wearable_double_text_item.eo
+++ b/src/lib/elementary/efl_wearable_circle_double_text_item.eo
@@ -1,10 +1,10 @@
-class Efl.Wearable.Double_Text_Item extends Efl.Wearable.Item implements
-                                            Efl.Text,
-                                            Efl.Text_Markup,
-                                            Efl.Ui.L10n,
-                                            Efl.Content
+class Efl.Wearable.Circle_Double_Text_Item extends Efl.Wearable.Circle_Item implements
+                                                   Efl.Text,
+                                                   Efl.Text_Markup,
+                                                   Efl.Ui.L10n,
+                                                   Efl.Content
 {
-   [[Wearable Double Text Item Class.
+   [[Wearable Circle Double Text Item Class.
 
      @since 1.23
    ]]

diff --git a/src/lib/elementary/efl_wearable_item.c b/src/lib/elementary/efl_wearable_circle_item.c
similarity index 75%
rename from src/lib/elementary/efl_wearable_item.c
rename to src/lib/elementary/efl_wearable_circle_item.c
index 25fb58c..994bb69 100644 (file)
--- a/src/lib/elementary/efl_wearable_item.c
+++ b/src/lib/elementary/efl_wearable_circle_item.c
@@ -8,10 +8,10 @@
 #include "elm_priv.h"
 #include "efl_ui_item_internal.h"
 
-#define MY_CLASS EFL_WEARABLE_ITEM_CLASS
-#define MY_CLASS_PFX  efl_wearable_item
+#define MY_CLASS EFL_WEARABLE_CIRCLE_ITEM_CLASS
+#define MY_CLASS_PFX  efl_wearable_circle_item
 
-#define MY_CLASS_NAME "Efl.Wearable.Item"
+#define MY_CLASS_NAME "Efl.Wearable.Circle_Item"
 
 static void
 _item_theme_update(Eo *obj)
@@ -33,7 +33,7 @@ _item_theme_update(Eo *obj)
 }
 
 EOLIAN static void
-_efl_wearable_item_efl_ui_item_container_set(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Widget *container)
+_efl_wearable_circle_item_efl_ui_item_container_set(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Widget *container)
 {
    Eo *prev_container = efl_ui_item_container_get(obj);
    efl_ui_item_container_set(efl_super(obj, MY_CLASS), container);
@@ -42,7 +42,7 @@ _efl_wearable_item_efl_ui_item_container_set(Eo *obj, void *pd EINA_UNUSED, Efl_
 }
 
 EOLIAN static Eo *
-_efl_wearable_item_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
+_efl_wearable_circle_item_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
 {
    obj = efl_constructor(efl_super(obj, MY_CLASS));
 
@@ -52,4 +52,4 @@ _efl_wearable_item_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
    return obj;
 }
 
-#include "efl_wearable_item.eo.c"
+#include "efl_wearable_circle_item.eo.c"

diff --git a/src/lib/elementary/efl_wearable_item.eo b/src/lib/elementary/efl_wearable_circle_item.eo
similarity index 60%
rename from src/lib/elementary/efl_wearable_item.eo
rename to src/lib/elementary/efl_wearable_circle_item.eo
index a4b9670..c473d2d 100644 (file)
--- a/src/lib/elementary/efl_wearable_item.eo
+++ b/src/lib/elementary/efl_wearable_circle_item.eo
@@ -1,6 +1,6 @@
-abstract Efl.Wearable.Item extends Efl.Ui.Item
+abstract Efl.Wearable.Circle_Item extends Efl.Ui.Item
 {
-   [[Wearable Item Class.
+   [[Wearable Circle Item Class.
 
      @since 1.23
    ]]

diff --git a/src/lib/elementary/efl_wearable_list_default_item.c b/src/lib/elementary/efl_wearable_circle_list_default_item.c
similarity index 55%
rename from src/lib/elementary/efl_wearable_list_default_item.c
rename to src/lib/elementary/efl_wearable_circle_list_default_item.c
index 04d012e..2a9c099 100644 (file)
--- a/src/lib/elementary/efl_wearable_list_default_item.c
+++ b/src/lib/elementary/efl_wearable_circle_list_default_item.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_WEARABLE_LIST_DEFAULT_ITEM_PROTECTED
+#define EFL_WEARABLE_CIRCLE_LIST_DEFAULT_ITEM_PROTECTED
 #define EFL_PART_PROTECTED
 
 #include <Elementary.h>
@@ -11,13 +11,13 @@
 #include "elm_priv.h"
 #include "elm_part_helper.h"
 
-#define MY_CLASS      EFL_WEARABLE_LIST_DEFAULT_ITEM_CLASS
-#define MY_CLASS_PFX  efl_wearable_list_default_item
+#define MY_CLASS      EFL_WEARABLE_CIRCLE_LIST_DEFAULT_ITEM_CLASS
+#define MY_CLASS_PFX  efl_wearable_circle_list_default_item
 
 #define MY_CLASS_NAME "Efl.Wearable.List_Default_Item"
 
 EOLIAN static Efl_Object *
-_efl_wearable_list_default_item_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
+_efl_wearable_circle_list_default_item_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
 {
    Eo *eo;
 
@@ -26,4 +26,4 @@ _efl_wearable_list_default_item_efl_object_constructor(Eo *obj, void *pd EINA_UN
 
    return eo;
 }
-#include "efl_wearable_list_default_item.eo.c"
+#include "efl_wearable_circle_list_default_item.eo.c"

diff --git a/src/lib/elementary/efl_wearable_list_default_item.eo b/src/lib/elementary/efl_wearable_circle_list_default_item.eo
similarity index 56%
rename from src/lib/elementary/efl_wearable_list_default_item.eo
rename to src/lib/elementary/efl_wearable_circle_list_default_item.eo
index 662f050..feeccc5 100644 (file)
--- a/src/lib/elementary/efl_wearable_list_default_item.eo
+++ b/src/lib/elementary/efl_wearable_circle_list_default_item.eo
@@ -1,7 +1,7 @@
 
-class Efl.Wearable.List_Default_Item extends Efl.Wearable.Default_Item
+class Efl.Wearable.Circle_List_Default_Item extends Efl.Wearable.Circle_Default_Item
 {
-   [[Wearable Default Item class to be used inside @Efl.Ui.List containers.
+   [[Wearable Circle Default Item class to be used inside @Efl.Ui.List containers.
      It displays the three parts in horizontal order: $icon, $text and $extra.
      Theming can change this arrangement.
 

diff --git a/src/lib/elementary/efl_wearable_circle_placeholder_item.c b/src/lib/elementary/efl_wearable_circle_placeholder_item.c
new file mode 100644 (file)
index 0000000..21ec28e
--- /dev/null
+++ b/src/lib/elementary/efl_wearable_circle_placeholder_item.c
@@ -0,0 +1,50 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+
+#define EFL_WEARABLE_CIRCLE_PLACEHOLDER_ITEM_PROTECTED
+#define EFL_PART_PROTECTED
+
+#include <Elementary.h>
+#include "Efl_Wearable.h"
+
+#include "elm_priv.h"
+#include "elm_part_helper.h"
+
+#define MY_CLASS      EFL_WEARABLE_CIRCLE_PLACEHOLDER_ITEM_CLASS
+#define MY_CLASS_PFX  efl_wearable_circle_placeholder_item
+
+#define MY_CLASS_NAME "Efl.Wearable.Circle_Placeholder_Item"
+
+EOLIAN static Efl_Object *
+_efl_wearable_circle_placeholder_item_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
+{
+   Eo *eo;
+
+   eo = efl_constructor(efl_super(obj, MY_CLASS));
+   elm_widget_theme_element_set(obj, "placeholder");
+
+   return eo;
+}
+
+/* Efl.Part */
+ELM_PART_CONTENT_DEFAULT_GET(efl_wearable_circle_placeholder_item, "efl.content")
+ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_wearable_circle_placeholder_item, void)
+/* Efl.Part end */
+
+EOLIAN static Efl_Object *
+_efl_wearable_circle_placeholder_item_efl_part_part_get(const Eo *obj, void *wd EINA_UNUSED, const char *part)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
+   if (eina_streq(part, "content"))
+     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_CONTENT_CLASS, obj, "efl.content");
+
+   return efl_part_get(efl_super(obj, MY_CLASS), part);
+}
+
+/* Internal EO APIs and hidden overrides */
+
+#define EFL_WEARABLE_CIRCLE_PLACEHOLDER_ITEM_EXTRA_OPS \
+  ELM_PART_CONTENT_DEFAULT_OPS(efl_wearable_circle_placeholder_item)
+
+#include "efl_wearable_circle_placeholder_item.eo.c"

diff --git a/src/lib/elementary/efl_wearable_placeholder_item.eo b/src/lib/elementary/efl_wearable_circle_placeholder_item.eo
similarity index 76%
rename from src/lib/elementary/efl_wearable_placeholder_item.eo
rename to src/lib/elementary/efl_wearable_circle_placeholder_item.eo
index 9ffaade..a47f62d 100644 (file)
--- a/src/lib/elementary/efl_wearable_placeholder_item.eo
+++ b/src/lib/elementary/efl_wearable_circle_placeholder_item.eo
@@ -1,7 +1,7 @@
 
-class Efl.Wearable.Placeholder_Item extends Efl.Wearable.Item implements Efl.Content
+class Efl.Wearable.Circle_Placeholder_Item extends Efl.Wearable.Circle_Item implements Efl.Content
 {
-   [[Wearable Placeholder Item class. This item have only one swallow space,
+   [[Wearable Circle Placeholder Item class. This item have only one swallow space,
      thus user can decorate item by filling the swallow with
      any kind of container.
 

diff --git a/src/lib/elementary/efl_wearable_circle_title_item.c b/src/lib/elementary/efl_wearable_circle_title_item.c
new file mode 100644 (file)
index 0000000..bdacc6c
--- /dev/null
+++ b/src/lib/elementary/efl_wearable_circle_title_item.c
@@ -0,0 +1,47 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+
+#define EFL_WEARABLE_CIRCLE_TITLE_ITEM_PROTECTED
+#define EFL_PART_PROTECTED
+
+#include <Elementary.h>
+#include "Efl_Wearable.h"
+
+#include "elm_priv.h"
+#include "elm_part_helper.h"
+
+#define MY_CLASS EFL_WEARABLE_CIRCLE_TITLE_ITEM_CLASS
+#define MY_CLASS_PFX  efl_wearable_circle_title_item
+
+#define MY_CLASS_NAME "Efl.Wearable.Circle_Title_Item"
+
+ELM_PART_TEXT_DEFAULT_GET(efl_wearable_circle_title_item, "efl.text")
+ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_wearable_circle_title_item, void)
+ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_wearable_circle_title_item, void)
+
+EOLIAN static Efl_Object *
+_efl_wearable_circle_title_item_efl_part_part_get(const Eo *obj, void *pd EINA_UNUSED, const char *part)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
+   if (eina_streq(part, "text"))
+     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_TEXT_CLASS, obj, "efl.text");
+
+   return efl_part_get(efl_super(obj, MY_CLASS), part);
+}
+
+EOLIAN static Efl_Object *
+_efl_wearable_circle_title_item_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
+{
+   Eo *eo;
+
+   eo = efl_constructor(efl_super(obj, MY_CLASS));
+   elm_widget_theme_element_set(obj, "title");
+
+   return eo;
+}
+
+#define EFL_WEARABLE_CIRCLE_TITLE_ITEM_EXTRA_OPS             \
+  ELM_PART_TEXT_DEFAULT_OPS(efl_wearable_circle_title_item)
+
+#include "efl_wearable_circle_title_item.eo.c"

diff --git a/src/lib/elementary/efl_wearable_title_item.eo b/src/lib/elementary/efl_wearable_circle_title_item.eo
similarity index 57%
rename from src/lib/elementary/efl_wearable_title_item.eo
rename to src/lib/elementary/efl_wearable_circle_title_item.eo
index 12dc424..aa4d340 100644 (file)
--- a/src/lib/elementary/efl_wearable_title_item.eo
+++ b/src/lib/elementary/efl_wearable_circle_title_item.eo
@@ -1,9 +1,9 @@
-class Efl.Wearable.Title_Item extends Efl.Wearable.Item implements
-                                      Efl.Text,
-                                      Efl.Text_Markup,
-                                      Efl.Ui.L10n
+class Efl.Wearable.Circle_Title_Item extends Efl.Wearable.Circle_Item implements
+                                             Efl.Text,
+                                             Efl.Text_Markup,
+                                             Efl.Ui.L10n
 {
-   [[Wearable Title Item Class.
+   [[Wearable Circle Title Item Class.
 
      @since 1.23
    ]]

diff --git a/src/lib/elementary/efl_wearable_default_item.c b/src/lib/elementary/efl_wearable_default_item.c
deleted file mode 100644 (file)
index 5a86122..0000000
--- a/src/lib/elementary/efl_wearable_default_item.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include "elementary_config.h"
-#endif
-
-#define EFL_WEARABLE_LIST_DEFAULT_ITEM_PROTECTED
-#define EFL_PART_PROTECTED
-
-#include <Elementary.h>
-#include "Efl_Wearable.h"
-
-#include "elm_priv.h"
-#include "elm_part_helper.h"
-
-#define MY_CLASS EFL_WEARABLE_DEFAULT_ITEM_CLASS
-#define MY_CLASS_PFX  efl_wearable_default_item
-
-#define MY_CLASS_NAME "Efl.Wearable.Default_Item"
-
-ELM_PART_TEXT_DEFAULT_GET(efl_wearable_default_item, "efl.text")
-ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_wearable_default_item, void)
-ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_wearable_default_item, void)
-ELM_PART_CONTENT_DEFAULT_GET(efl_wearable_default_item, "efl.icon")
-ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_wearable_default_item, void)
-
-EOLIAN static Efl_Object *
-_efl_wearable_default_item_efl_part_part_get(const Eo *obj, void *pd EINA_UNUSED, const char *part)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
-   if (eina_streq(part, "text"))
-     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_TEXT_CLASS, obj, "efl.text");
-   else if (eina_streq(part, "icon"))
-     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_CONTENT_CLASS, obj, "efl.icon");
-   else if (eina_streq(part, "extra"))
-     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_CONTENT_CLASS, obj, "efl.extra");
-
-   return efl_part_get(efl_super(obj, MY_CLASS), part);
-}
-
-
-#define EFL_WEARABLE_DEFAULT_ITEM_EXTRA_OPS             \
-  ELM_PART_TEXT_DEFAULT_OPS(efl_wearable_default_item), \
-  ELM_PART_CONTENT_DEFAULT_OPS(efl_wearable_default_item)
-
-#include "efl_wearable_default_item.eo.c"

diff --git a/src/lib/elementary/efl_wearable_double_text_item.c b/src/lib/elementary/efl_wearable_double_text_item.c
deleted file mode 100644 (file)
index 98f2fdf..0000000
--- a/src/lib/elementary/efl_wearable_double_text_item.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include "elementary_config.h"
-#endif
-
-#define EFL_WEARABLE_DOUBLE_TEXT_ITEM_PROTECTED
-#define EFL_PART_PROTECTED
-
-#include <Elementary.h>
-#include "Efl_Wearable.h"
-
-#include "elm_priv.h"
-#include "elm_part_helper.h"
-
-#define MY_CLASS EFL_WEARABLE_DOUBLE_TEXT_ITEM_CLASS
-#define MY_CLASS_PFX  efl_wearable_double_text_item
-
-#define MY_CLASS_NAME "Efl.Wearable.Double_Text_Item"
-
-ELM_PART_TEXT_DEFAULT_GET(efl_wearable_double_text_item, "efl.text")
-ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_wearable_double_text_item, void)
-ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_wearable_double_text_item, void)
-ELM_PART_CONTENT_DEFAULT_GET(efl_wearable_double_text_item, "efl.icon")
-ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_wearable_double_text_item, void)
-
-EOLIAN static Efl_Object *
-_efl_wearable_double_text_item_efl_part_part_get(const Eo *obj, void *pd EINA_UNUSED, const char *part)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
-   if (eina_streq(part, "text"))
-     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_TEXT_CLASS, obj, "efl.text");
-   if (eina_streq(part, "sub_text"))
-     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_TEXT_CLASS, obj, "efl.sub_text");
-   else if (eina_streq(part, "icon"))
-     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_CONTENT_CLASS, obj, "efl.icon");
-   else if (eina_streq(part, "extra"))
-     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_CONTENT_CLASS, obj, "efl.extra");
-
-   return efl_part_get(efl_super(obj, MY_CLASS), part);
-}
-
-EOLIAN static Efl_Object *
-_efl_wearable_double_text_item_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
-{
-   Eo *eo;
-
-   eo = efl_constructor(efl_super(obj, MY_CLASS));
-   elm_widget_theme_element_set(obj, "double_text");
-   return eo;
-}
-
-#define EFL_WEARABLE_DOUBLE_TEXT_ITEM_EXTRA_OPS             \
-  ELM_PART_TEXT_DEFAULT_OPS(efl_wearable_double_text_item), \
-  ELM_PART_CONTENT_DEFAULT_OPS(efl_wearable_double_text_item)
-
-#include "efl_wearable_double_text_item.eo.c"

diff --git a/src/lib/elementary/efl_wearable_placeholder_item.c b/src/lib/elementary/efl_wearable_placeholder_item.c
deleted file mode 100644 (file)
index c371a0b..0000000
--- a/src/lib/elementary/efl_wearable_placeholder_item.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include "elementary_config.h"
-#endif
-
-#define EFL_WEARABLE_PLACEHOLDER_ITEM_PROTECTED
-#define EFL_PART_PROTECTED
-
-#include <Elementary.h>
-#include "Efl_Wearable.h"
-
-#include "elm_priv.h"
-#include "elm_part_helper.h"
-
-#define MY_CLASS      EFL_WEARABLE_PLACEHOLDER_ITEM_CLASS
-#define MY_CLASS_PFX  efl_wearable_placeholder_item
-
-#define MY_CLASS_NAME "Efl.Wearable.Placeholder_Item"
-
-EOLIAN static Efl_Object *
-_efl_wearable_placeholder_item_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
-{
-   Eo *eo;
-
-   eo = efl_constructor(efl_super(obj, MY_CLASS));
-   elm_widget_theme_element_set(obj, "placeholder");
-
-   return eo;
-}
-
-/* Efl.Part */
-ELM_PART_CONTENT_DEFAULT_GET(efl_wearable_placeholder_item, "efl.content")
-ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_wearable_placeholder_item, void)
-/* Efl.Part end */
-
-EOLIAN static Efl_Object *
-_efl_wearable_placeholder_item_efl_part_part_get(const Eo *obj, void *wd EINA_UNUSED, const char *part)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
-   if (eina_streq(part, "content"))
-     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_CONTENT_CLASS, obj, "efl.content");
-
-   return efl_part_get(efl_super(obj, MY_CLASS), part);
-}
-
-/* Internal EO APIs and hidden overrides */
-
-#define EFL_WEARABLE_PLACEHOLDER_ITEM_EXTRA_OPS \
-  ELM_PART_CONTENT_DEFAULT_OPS(efl_wearable_placeholder_item)
-
-#include "efl_wearable_placeholder_item.eo.c"

diff --git a/src/lib/elementary/efl_wearable_title_item.c b/src/lib/elementary/efl_wearable_title_item.c
deleted file mode 100644 (file)
index ed21b15..0000000
--- a/src/lib/elementary/efl_wearable_title_item.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include "elementary_config.h"
-#endif
-
-#define EFL_WEARABLE_TITLE_ITEM_PROTECTED
-#define EFL_PART_PROTECTED
-
-#include <Elementary.h>
-#include "Efl_Wearable.h"
-
-#include "elm_priv.h"
-#include "elm_part_helper.h"
-
-#define MY_CLASS EFL_WEARABLE_TITLE_ITEM_CLASS
-#define MY_CLASS_PFX  efl_wearable_title_item
-
-#define MY_CLASS_NAME "Efl.Wearable.Title_Item"
-
-ELM_PART_TEXT_DEFAULT_GET(efl_wearable_title_item, "efl.text")
-ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_wearable_title_item, void)
-ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_wearable_title_item, void)
-
-EOLIAN static Efl_Object *
-_efl_wearable_title_item_efl_part_part_get(const Eo *obj, void *pd EINA_UNUSED, const char *part)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
-   if (eina_streq(part, "text"))
-     return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_TEXT_CLASS, obj, "efl.text");
-
-   return efl_part_get(efl_super(obj, MY_CLASS), part);
-}
-
-EOLIAN static Efl_Object *
-_efl_wearable_title_item_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
-{
-   Eo *eo;
-
-   eo = efl_constructor(efl_super(obj, MY_CLASS));
-   elm_widget_theme_element_set(obj, "title");
-
-   return eo;
-}
-
-#define EFL_WEARABLE_TITLE_ITEM_EXTRA_OPS             \
-  ELM_PART_TEXT_DEFAULT_OPS(efl_wearable_title_item)
-
-#include "efl_wearable_title_item.eo.c"

diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index bbb1165..664fefb 100644 (file)
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -199,12 +199,12 @@ pub_eo_files = [
 #<--TIZEN_ONLY
 pub_eo_files += [
   'efl_wearable_position_manager_circle_list.eo',
-  'efl_wearable_item.eo',
-  'efl_wearable_default_item.eo',
-  'efl_wearable_list_default_item.eo',
-  'efl_wearable_placeholder_item.eo',
-  'efl_wearable_title_item.eo',
-  'efl_wearable_double_text_item.eo',
+  'efl_wearable_circle_item.eo',
+  'efl_wearable_circle_default_item.eo',
+  'efl_wearable_circle_list_default_item.eo',
+  'efl_wearable_circle_placeholder_item.eo',
+  'efl_wearable_circle_title_item.eo',
+  'efl_wearable_circle_double_text_item.eo',
 ]
 #TIZEN_ONLY-->
 
@@ -1028,12 +1028,12 @@ elementary_src += [
   'tizen_vector.c',
   'tizen_util.c',
   'efl_wearable_position_manager_circle_list.c',
-  'efl_wearable_item.c',
-  'efl_wearable_default_item.c',
-  'efl_wearable_list_default_item.c',
-  'efl_wearable_placeholder_item.c',
-  'efl_wearable_title_item.c',
-  'efl_wearable_double_text_item.c',
+  'efl_wearable_circle_item.c',
+  'efl_wearable_circle_default_item.c',
+  'efl_wearable_circle_list_default_item.c',
+  'efl_wearable_circle_placeholder_item.c',
+  'efl_wearable_circle_title_item.c',
+  'efl_wearable_circle_double_text_item.c',
 ]
 
 elementary_src_tizen = [