aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/bin/ui/colorclass_manager.c2
-rw-r--r--src/bin/ui/image_manager.c2
-rw-r--r--src/bin/ui/project_navigator.c2
-rw-r--r--src/bin/ui/property/property_group.c4
-rw-r--r--src/bin/ui/sound_manager.c4
-rw-r--r--src/bin/ui/sound_player/sound_player.c9
-rw-r--r--src/bin/ui/style_manager.c4
-rw-r--r--src/bin/ui/tab_home_import_edc.c2
-rw-r--r--src/bin/ui/tab_home_import_edj.c2
-rw-r--r--src/bin/ui/tab_home_new.c2
-rw-r--r--src/bin/ui/workspace/group_navigator.c10
-rw-r--r--src/lib/ewe_private.h3
-rw-r--r--src/lib/ewe_ruler.c58
-rw-r--r--src/lib/ewe_ruler.eo14
14 files changed, 58 insertions, 60 deletions
diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c
index 850b6f330..c99082272 100644
--- a/src/bin/ui/colorclass_manager.c
+++ b/src/bin/ui/colorclass_manager.c
@@ -86,7 +86,7 @@ _add_colorclass_content_get(void *data __UNUSED__, Evas_Object *popup, Evas_Obje
LAYOUT_PROP_ADD(ap.win, _("Color class name: "), "popup", "1swallow")
ENTRY_ADD(item, mng.entry, true);
- efl_event_callback_add(mng.entry, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, mng.name_validator);
+ efl_event_callback_add(mng.entry, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, mng.name_validator);
evas_object_smart_callback_add(mng.entry, signals.elm.entry.changed, _validation, popup);
elm_object_part_text_set(mng.entry, "guide", _("Type new color class name here"));
elm_object_part_content_set(item, "elm.swallow.content", mng.entry);
diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c
index 0322c659e..c26b3b485 100644
--- a/src/bin/ui/image_manager.c
+++ b/src/bin/ui/image_manager.c
@@ -804,7 +804,7 @@ _add_image_set_content_get(void *data __UNUSED__, Evas_Object *popup, Evas_Objec
elm_box_padding_set(box, 0, 10);
LAYOUT_PROP_ADD(box, _("Image set name:"), "popup", "1swallow")
ENTRY_ADD(item, mng.image_set.entry, true);
- efl_event_callback_add(mng.image_set.entry, ELM_ENTRY_EVENT_VALIDATE,
+ efl_event_callback_add(mng.image_set.entry, EFL_UI_TEXT_EVENT_VALIDATE,
resource_name_validator_helper, mng.image_set.validator);
evas_object_smart_callback_add(mng.image_set.entry, signals.elm.entry.changed, _validation, popup);
elm_object_part_text_set(mng.image_set.entry, "guide", _("Type a new image set name"));
diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c
index 8105a850b..d3d6b9549 100644
--- a/src/bin/ui/project_navigator.c
+++ b/src/bin/ui/project_navigator.c
@@ -460,7 +460,7 @@ _add_group_content_get(void *data __UNUSED__, Evas_Object *popup, Evas_Object **
LAYOUT_PROP_ADD(layout_p.box, _("Name"), "popup", "1swallow")
ENTRY_ADD(layout_p.box, layout_p.entry, true)
evas_object_smart_callback_add(layout_p.entry, signals.elm.entry.changed, _group_validate, popup);
- efl_event_callback_add(layout_p.entry, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, validator);
+ efl_event_callback_add(layout_p.entry, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, validator);
elm_layout_content_set(item, NULL, layout_p.entry);
elm_box_pack_end(layout_p.box, item);
glit = elm_genlist_selected_item_get(project_navigator.genlist);
diff --git a/src/bin/ui/property/property_group.c b/src/bin/ui/property/property_group.c
index f7898a39b..8ec0126c2 100644
--- a/src/bin/ui/property/property_group.c
+++ b/src/bin/ui/property/property_group.c
@@ -876,10 +876,10 @@ _init_cb(Property_Attribute *pa, Property_Action *action)
evas_object_smart_callback_add(action->control, signals.eflete.property.script_control.clicked, _btn_script_manager_cb, NULL);
break;
case ATTRIBUTE_PART_NAME:
- efl_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, group_pd.part_name_validator);
+ efl_event_callback_add(action->control, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, group_pd.part_name_validator);
break;
case ATTRIBUTE_GROUP_DATA_NAME:
- efl_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, group_pd.group_data_name_validator);
+ efl_event_callback_add(action->control, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, group_pd.group_data_name_validator);
break;
case ATTRIBUTE_STATE_IMAGE:
case ATTRIBUTE_STATE_VECTOR:
diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c
index fdbbad194..45c3fbb3c 100644
--- a/src/bin/ui/sound_manager.c
+++ b/src/bin/ui/sound_manager.c
@@ -372,7 +372,7 @@ _add_tone_content_get(void *data __UNUSED__, Evas_Object *popup, Evas_Object **t
elm_box_padding_set(box, 0, 10);
LAYOUT_PROP_ADD(box, _("Tone name:"), "popup", "1swallow")
ENTRY_ADD(item, mng.tone_entry, true);
- efl_event_callback_add(mng.tone_entry, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, mng.tone_validator);
+ efl_event_callback_add(mng.tone_entry, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, mng.tone_validator);
evas_object_smart_callback_add(mng.tone_entry, signals.elm.entry.changed, _validation, popup);
elm_object_part_text_set(mng.tone_entry, "guide", _("Type a new tone name"));
elm_object_part_content_set(item, "elm.swallow.content", mng.tone_entry);
@@ -382,7 +382,7 @@ _add_tone_content_get(void *data __UNUSED__, Evas_Object *popup, Evas_Object **t
LAYOUT_PROP_ADD(box, _("Frequency:"), "popup", "1swallow")
ENTRY_ADD(item, mng.frq_entry, true);
- efl_event_callback_add(mng.frq_entry, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, mng.frq_validator);
+ efl_event_callback_add(mng.frq_entry, EFL_UI_TEXT_EVENT_VALIDATE, elm_validator_regexp_helper, mng.frq_validator);
evas_object_smart_callback_add(mng.frq_entry, signals.elm.entry.changed, _validation, popup);
/* force validator trigger */
elm_entry_entry_set(mng.frq_entry, " ");
diff --git a/src/bin/ui/sound_player/sound_player.c b/src/bin/ui/sound_player/sound_player.c
index f5d317d2b..eac229e0f 100644
--- a/src/bin/ui/sound_player/sound_player.c
+++ b/src/bin/ui/sound_player/sound_player.c
@@ -157,9 +157,9 @@ _on_rewin_cb(void *data __UNUSED__,
static void
_create_io_stream()
{
- in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
+ in = efl_add_ref(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
assert(in != NULL);
- out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL);
+ out = efl_add_ref(ECORE_AUDIO_OUT_PULSE_CLASS, NULL);
assert(out != NULL);
efl_event_callback_add(out, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL,
_out_fail, NULL);
@@ -177,7 +177,7 @@ _tone_play()
if (!in)
{
- in = efl_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
+ in = efl_add_ref(ECORE_AUDIO_IN_TONE_CLASS, NULL);
ecore_audio_obj_name_set(in, tone->common.name);
efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &tone->freq);
ecore_audio_obj_in_length_set(in, TONE_PLAYING_DURATION);
@@ -186,7 +186,7 @@ _tone_play()
}
if (!out)
- out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL,
+ out = efl_add_ref(ECORE_AUDIO_OUT_PULSE_CLASS, NULL,
efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL,
_out_fail, NULL));
@@ -194,7 +194,6 @@ _tone_play()
if (!ret)
{
ERR("Couldn't attach input and output!");
- abort();
}
elm_slider_min_max_set(rewin, 0.0, TONE_PLAYING_DURATION);
elm_slider_value_set(rewin, 0.0);
diff --git a/src/bin/ui/style_manager.c b/src/bin/ui/style_manager.c
index 5a41018bc..36cc28677 100644
--- a/src/bin/ui/style_manager.c
+++ b/src/bin/ui/style_manager.c
@@ -189,7 +189,7 @@ _add_style_content_get(void *data __UNUSED__, Evas_Object *popup, Evas_Object **
LAYOUT_PROP_ADD(mng.win, _("Style name:"), "popup", "1swallow");
mng.popup.item = item;
ENTRY_ADD(mng.popup.item, mng.popup.name, true);
- efl_event_callback_add(mng.popup.name, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, mng.popup.validator);
+ efl_event_callback_add(mng.popup.name, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, mng.popup.validator);
evas_object_smart_callback_add(mng.popup.name, signals.elm.entry.changed, _validate, popup);
elm_object_part_text_set(mng.popup.name, "guide", _("Type a new style name"));
elm_object_part_content_set(mng.popup.item, "elm.swallow.content", mng.popup.name);
@@ -261,7 +261,7 @@ _add_tag_content_get(void *data __UNUSED__, Evas_Object *popup, Evas_Object **to
LAYOUT_PROP_ADD(mng.win, "Tag name:", "popup", "1swallow");
ENTRY_ADD(item, mng.popup.name, true);
- efl_event_callback_add(mng.popup.name, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, mng.popup.validator);
+ efl_event_callback_add(mng.popup.name, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, mng.popup.validator);
evas_object_smart_callback_add(mng.popup.name, signals.elm.entry.changed, _validate, popup);
elm_object_part_text_set(mng.popup.name, "guide", _("Type a new tag name."));
elm_object_part_content_set(item, "elm.swallow.content", mng.popup.name);
diff --git a/src/bin/ui/tab_home_import_edc.c b/src/bin/ui/tab_home_import_edc.c
index f8c303df2..dc225f6e9 100644
--- a/src/bin/ui/tab_home_import_edc.c
+++ b/src/bin/ui/tab_home_import_edc.c
@@ -517,7 +517,7 @@ _tab_import_edc_add(void)
/* label.name */
LAYOUT_PROP_ADD(tab_edc.box, _("Project name:"), "tab_home", "item")
ENTRY_ADD(item, tab_edc.name, true)
- efl_event_callback_add(tab_edc.name, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, tab_edc.name_validator);
+ efl_event_callback_add(tab_edc.name, EFL_UI_TEXT_EVENT_VALIDATE, elm_validator_regexp_helper, tab_edc.name_validator);
evas_object_smart_callback_add(tab_edc.name, signals.elm.entry.changed, _validate, NULL);
elm_layout_content_set(item, NULL, tab_edc.name);
elm_box_pack_end(tab_edc.box, item);
diff --git a/src/bin/ui/tab_home_import_edj.c b/src/bin/ui/tab_home_import_edj.c
index e7389a701..45a371c17 100644
--- a/src/bin/ui/tab_home_import_edj.c
+++ b/src/bin/ui/tab_home_import_edj.c
@@ -571,7 +571,7 @@ _tab_import_edj_add(void)
/* label.name */
elm_object_part_text_set(tab_edj.layout, "label.name", _("Project name:"));
ENTRY_ADD(tab_edj.layout, tab_edj.name, true)
- efl_event_callback_add(tab_edj.name, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, tab_edj.name_validator);
+ efl_event_callback_add(tab_edj.name, EFL_UI_TEXT_EVENT_VALIDATE, elm_validator_regexp_helper, tab_edj.name_validator);
evas_object_smart_callback_add(tab_edj.name, signals.elm.entry.changed, _name_changed_cb, NULL);
elm_object_part_content_set(tab_edj.layout, "swallow.name", tab_edj.name);
/* label.path */
diff --git a/src/bin/ui/tab_home_new.c b/src/bin/ui/tab_home_new.c
index 88a25a77a..3c0552049 100644
--- a/src/bin/ui/tab_home_new.c
+++ b/src/bin/ui/tab_home_new.c
@@ -629,7 +629,7 @@ _tab_new_project_add(void)
/* label.name */
elm_object_part_text_set(tab_new.layout, "label.name", _("Project name:"));
ENTRY_ADD(tab_new.layout, tab_new.name, true)
- efl_event_callback_add(tab_new.name, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, tab_new.name_validator);
+ efl_event_callback_add(tab_new.name, EFL_UI_TEXT_EVENT_VALIDATE, elm_validator_regexp_helper, tab_new.name_validator);
evas_object_smart_callback_add(tab_new.name, signals.elm.entry.changed, _validate, NULL);
elm_object_part_content_set(tab_new.layout, "swallow.name", tab_new.name);
/* label.path */
diff --git a/src/bin/ui/workspace/group_navigator.c b/src/bin/ui/workspace/group_navigator.c
index 63996b347..d7e7ae96f 100644
--- a/src/bin/ui/workspace/group_navigator.c
+++ b/src/bin/ui/workspace/group_navigator.c
@@ -1124,7 +1124,7 @@ _add_part_content_get(void *data, Evas_Object *popup __UNUSED__, Evas_Object **t
LAYOUT_PROP_ADD(box, _("Part name"), "popup", "1swallow")
ENTRY_ADD(box, pl->popup.entry_name, true);
- efl_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, pl->part_name_validator);
+ efl_event_callback_add(pl->popup.entry_name, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, pl->part_name_validator);
elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter the name of the new part"));
resource_name_validator_list_set(pl->part_name_validator, &pl->group->parts, false);
evas_object_smart_callback_add(pl->popup.entry_name, signals.elm.entry.changed, _on_part_name_changed, pl);
@@ -1256,7 +1256,7 @@ _add_group_data_content_get(void *data, Evas_Object *popup __UNUSED__, Evas_Obje
LAYOUT_PROP_ADD(box, _("Data item name"), "popup", "1swallow")
ENTRY_ADD(box, pl->popup.entry_name, true);
- efl_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, pl->group_data_name_validator);
+ efl_event_callback_add(pl->popup.entry_name, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, pl->group_data_name_validator);
elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter the name of the new group_data"));
resource_name_validator_list_set(pl->group_data_name_validator, &pl->group->data_items, false);
evas_object_smart_callback_add(pl->popup.entry_name, signals.elm.entry.changed, _on_group_data_name_changed, pl);
@@ -1395,7 +1395,7 @@ _add_state_content_get(void *data, Evas_Object *popup __UNUSED__, Evas_Object **
LAYOUT_PROP_ADD(box, _("State name"), "popup", "1swallow");
ENTRY_ADD(item, pl->popup.entry_name, true);
- efl_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE,
+ efl_event_callback_add(pl->popup.entry_name, EFL_UI_TEXT_EVENT_VALIDATE,
elm_validator_regexp_helper, pl->name_validator);
evas_object_smart_callback_add(pl->popup.entry_name, signals.elm.entry.changed, _state_validate, pl);
elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter the name of the new state"));
@@ -1545,7 +1545,7 @@ _add_item_content_get(void *data, Evas_Object *popup __UNUSED__, Evas_Object **t
LAYOUT_PROP_ADD(box, _("Name"), "popup", "1swallow")
ENTRY_ADD(item, pl->popup.entry_name, true);
- efl_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE,
+ efl_event_callback_add(pl->popup.entry_name, EFL_UI_TEXT_EVENT_VALIDATE,
elm_validator_regexp_helper, pl->name_validator);
evas_object_smart_callback_add(pl->popup.entry_name, signals.elm.entry.changed, _item_validate, pl);
elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter the name of the new item"));
@@ -1676,7 +1676,7 @@ _add_program_content_get(void *data, Evas_Object *popup __UNUSED__, Evas_Object
LAYOUT_PROP_ADD(box, _("Program name"), "popup", "1swallow")
ENTRY_ADD(item, pl->popup.entry_name, true);
- efl_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE,
+ efl_event_callback_add(pl->popup.entry_name, EFL_UI_TEXT_EVENT_VALIDATE,
resource_name_validator_helper, pl->program_name_validator);
resource_name_validator_list_set(pl->program_name_validator, &pl->group->programs, false);
evas_object_smart_callback_add(pl->popup.entry_name, signals.elm.entry.changed, _program_validate, pl);
diff --git a/src/lib/ewe_private.h b/src/lib/ewe_private.h
index c5b114d56..fd5b73144 100644
--- a/src/lib/ewe_private.h
+++ b/src/lib/ewe_private.h
@@ -18,7 +18,7 @@
#ifndef EWE_PRIVATE_H
#define EWE_PRIVATE_H
-#define ELM_WIDGET_PROTECTED
+#define EFL_UI_WIDGET_PROTECTED
#define EFL_CANVAS_OBJECT_PROTECTED
#define EFL_CANVAS_GROUP_PROTECTED
#define EFL_CANVAS_GROUP_BETA
@@ -33,7 +33,6 @@
#include <Eo.h>
#include <Evas.h>
#include <Elementary.h>
-#include <elm_widget.h>
#include <elm_widget_layout.h>
#include <elm_interface_scrollable.h>
diff --git a/src/lib/ewe_ruler.c b/src/lib/ewe_ruler.c
index e2caf2678..a9194b82e 100644
--- a/src/lib/ewe_ruler.c
+++ b/src/lib/ewe_ruler.c
@@ -258,7 +258,7 @@ _ewe_ruler_horizontal_set(Eo *obj,
}
EOLIAN static Eina_Bool
-_ewe_ruler_horizontal_get(Eo *obj EINA_UNUSED, Ewe_Ruler_Smart_Data *sd)
+_ewe_ruler_horizontal_get(const Eo *obj EINA_UNUSED, Ewe_Ruler_Smart_Data *sd)
{
return sd->horizontal;
}
@@ -285,7 +285,7 @@ _ewe_ruler_step_set(Eo *obj,
}
EOLIAN static unsigned int
-_ewe_ruler_step_get(Eo *obj EINA_UNUSED,
+_ewe_ruler_step_get(const Eo *obj EINA_UNUSED,
Ewe_Ruler_Smart_Data *sd,
Ewe_Ruler_Scale *scale)
{
@@ -309,7 +309,7 @@ _ewe_ruler_value_step_set(Eo *obj,
}
EOLIAN static double
-_ewe_ruler_value_step_get(Eo *obj EINA_UNUSED,
+_ewe_ruler_value_step_get(const Eo *obj EINA_UNUSED,
Ewe_Ruler_Smart_Data *sd,
Ewe_Ruler_Scale *scale)
{
@@ -335,7 +335,7 @@ _ewe_ruler_zero_offset_set(Eo *obj,
}
EOLIAN static int
-_ewe_ruler_zero_offset_get(Eo *obj EINA_UNUSED,
+_ewe_ruler_zero_offset_get(const Eo *obj EINA_UNUSED,
Ewe_Ruler_Smart_Data *sd,
Ewe_Ruler_Scale *scale)
{
@@ -361,7 +361,7 @@ _ewe_ruler_format_set(Eo *obj,
}
EOLIAN static const char *
-_ewe_ruler_format_get(Eo *obj EINA_UNUSED,
+_ewe_ruler_format_get(const Eo *obj EINA_UNUSED,
Ewe_Ruler_Smart_Data *sd,
Ewe_Ruler_Scale *scale)
{
@@ -371,10 +371,10 @@ _ewe_ruler_format_get(Eo *obj EINA_UNUSED,
}
EOLIAN static Eina_Bool
-_ewe_ruler_style_set(Eo *obj,
- Ewe_Ruler_Smart_Data *sd,
- Ewe_Ruler_Scale *scale,
- const char *style)
+_ewe_ruler_scale_style_set(Eo *obj,
+ Ewe_Ruler_Smart_Data *sd,
+ Ewe_Ruler_Scale *scale,
+ const char *style)
{
if (!scale) scale = eina_list_data_get(sd->scales);
if (!scale) return EINA_FALSE;
@@ -394,9 +394,9 @@ _ewe_ruler_style_set(Eo *obj,
}
EOLIAN static const char *
-_ewe_ruler_style_get(Eo *obj EINA_UNUSED,
- Ewe_Ruler_Smart_Data *sd,
- Ewe_Ruler_Scale *scale)
+_ewe_ruler_scale_style_get(const Eo *obj EINA_UNUSED,
+ Ewe_Ruler_Smart_Data *sd,
+ Ewe_Ruler_Scale *scale)
{
if (!scale) scale = eina_list_data_get(sd->scales);
if (!scale) return 0;
@@ -453,7 +453,7 @@ _ewe_ruler_scale_del(Eo *obj EINA_UNUSED,
}
EOLIAN static Eina_Bool
-_ewe_ruler_scale_visible_get(Eo *obj EINA_UNUSED,
+_ewe_ruler_scale_visible_get(const Eo *obj EINA_UNUSED,
Ewe_Ruler_Smart_Data *sd,
Ewe_Ruler_Scale *scale)
{
@@ -495,7 +495,7 @@ _ewe_ruler_scale_visible_set(Eo *obj EINA_UNUSED,
}
EOLIAN static Eina_Bool
-_ewe_ruler_scale_middle_mark_get(Eo *obj EINA_UNUSED,
+_ewe_ruler_scale_middle_mark_get(const Eo *obj EINA_UNUSED,
Ewe_Ruler_Smart_Data *sd,
Ewe_Ruler_Scale *scale)
{
@@ -597,7 +597,7 @@ _ewe_ruler_marker_size_set(Eo *obj,
}
EOLIAN static int
-_ewe_ruler_marker_size_get(Eo *obj EINA_UNUSED,
+_ewe_ruler_marker_size_get(const Eo *obj EINA_UNUSED,
Ewe_Ruler_Smart_Data *sd EINA_UNUSED,
Ewe_Ruler_Marker *marker)
{
@@ -614,7 +614,7 @@ _ewe_ruler_marker_text_set(Eo *obj EINA_UNUSED,
}
EOLIAN static const char *
-_ewe_ruler_marker_text_get(Eo *obj EINA_UNUSED,
+_ewe_ruler_marker_text_get(const Eo *obj EINA_UNUSED,
Ewe_Ruler_Smart_Data *sd EINA_UNUSED,
Ewe_Ruler_Marker *marker)
{
@@ -668,7 +668,7 @@ _ewe_ruler_marker_relative_set(Eo *obj,
}
EOLIAN static double
-_ewe_ruler_marker_relative_get(Eo *obj EINA_UNUSED,
+_ewe_ruler_marker_relative_get(const Eo *obj EINA_UNUSED,
Ewe_Ruler_Smart_Data *sd,
Ewe_Ruler_Marker *marker,
Ewe_Ruler_Scale *scale)
@@ -709,7 +709,7 @@ _ewe_ruler_marker_absolute_set(Eo *obj,
}
EOLIAN static int
-_ewe_ruler_marker_absolute_get(Eo *obj EINA_UNUSED,
+_ewe_ruler_marker_absolute_get(const Eo *obj EINA_UNUSED,
Ewe_Ruler_Smart_Data *sd EINA_UNUSED,
Ewe_Ruler_Marker *marker)
{
@@ -721,7 +721,7 @@ _ewe_ruler_marker_absolute_get(Eo *obj EINA_UNUSED,
}
EOLIAN static Eina_Bool
-_ewe_ruler_marker_visible_get(Eo *obj EINA_UNUSED,
+_ewe_ruler_marker_visible_get(const Eo *obj EINA_UNUSED,
Ewe_Ruler_Smart_Data *sd EINA_UNUSED,
Ewe_Ruler_Marker *marker)
{
@@ -772,7 +772,7 @@ _ewe_ruler_marker_style_set(Eo *obj,
}
EOLIAN static const char *
-_ewe_ruler_marker_style_get(Eo *obj EINA_UNUSED,
+_ewe_ruler_marker_style_get(const Eo *obj EINA_UNUSED,
Ewe_Ruler_Smart_Data *sd EINA_UNUSED,
Ewe_Ruler_Marker *marker)
{
@@ -786,7 +786,7 @@ static void
_ewe_ruler_show(Eo* obj, Ewe_Ruler_Smart_Data *sd)
{
if (sd->ruler_visible) return;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE);
Ewe_Ruler_Scale *scale;
Ewe_Ruler_Marker *marker;
@@ -823,7 +823,7 @@ static void
_ewe_ruler_hide(Eo* obj, Ewe_Ruler_Smart_Data *sd)
{
if (!sd->ruler_visible) return;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE);
Ewe_Ruler_Scale *scale;
Ewe_Ruler_Marker *marker;
@@ -847,7 +847,7 @@ _ewe_ruler_hide(Eo* obj, Ewe_Ruler_Smart_Data *sd)
}
EOLIAN static void
-_ewe_ruler_efl_gfx_visible_set(Eo *obj, Ewe_Ruler_Smart_Data *sd, Eina_Bool vis)
+_ewe_ruler_efl_gfx_entity_visible_set(Eo *obj, Ewe_Ruler_Smart_Data *sd, Eina_Bool vis)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
@@ -859,14 +859,14 @@ _ewe_ruler_efl_gfx_visible_set(Eo *obj, Ewe_Ruler_Smart_Data *sd, Eina_Bool vis)
}
EOLIAN static void
-_ewe_ruler_efl_gfx_position_set(Eo *obj,
+_ewe_ruler_efl_gfx_entity_position_set(Eo *obj,
Ewe_Ruler_Smart_Data *sd,
Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
evas_object_move(obj, pos.x, pos.y);
evas_object_move(sd->clip, pos.x, pos.y);
@@ -879,7 +879,7 @@ _ewe_ruler_efl_gfx_position_set(Eo *obj,
}
EOLIAN static void
-_ewe_ruler_efl_gfx_size_set(Eo *obj,
+_ewe_ruler_efl_gfx_entity_size_set(Eo *obj,
Ewe_Ruler_Smart_Data *sd,
Eina_Size2D size)
{
@@ -896,7 +896,7 @@ _ewe_ruler_efl_gfx_size_set(Eo *obj,
evas_object_smart_changed(obj);
- efl_gfx_size_set(efl_super(obj, MY_CLASS), size);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), size);
}
EOLIAN static void
@@ -954,11 +954,11 @@ _ewe_ruler_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED,
}
EOLIAN static Efl_Ui_Theme_Apply
-_ewe_ruler_elm_widget_theme_apply(Eo *obj, Ewe_Ruler_Smart_Data *sd)
+_ewe_ruler_efl_ui_widget_theme_apply(Eo *obj, Ewe_Ruler_Smart_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int count;
- int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
+ int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (int_ret == EFL_UI_THEME_APPLY_FAILED) return EFL_UI_THEME_APPLY_FAILED;
Ewe_Ruler_Scale *scale;
diff --git a/src/lib/ewe_ruler.eo b/src/lib/ewe_ruler.eo
index bf791e04d..cb68476a1 100644
--- a/src/lib/ewe_ruler.eo
+++ b/src/lib/ewe_ruler.eo
@@ -1,7 +1,7 @@
type Ewe_Ruler_Scale: __undefined_type;
type Ewe_Ruler_Marker: __undefined_type;
-class Ewe.Ruler (Efl.Ui.Layout)
+class Ewe.Ruler (Efl.Ui.Layout.Object)
{
eo_prefix: ewe_obj_ruler;
legacy_prefix: ewe_ruler;
@@ -91,7 +91,7 @@ class Ewe.Ruler (Efl.Ui.Layout)
format: string;
}
}
- @property style {
+ @property scale_style {
get {
[[
Get style of given scale.
@@ -101,7 +101,7 @@ class Ewe.Ruler (Efl.Ui.Layout)
[[
Set style for given scale
]]
- return: bool; [[EINA_TRUE if style was setted or EINA_FALSE on failure.]]
+ return: bool; [[EINA_TRUE if style was set or EINA_FALSE on failure.]]
}
keys {
scale: ptr(Ewe_Ruler_Scale);
@@ -315,11 +315,11 @@ class Ewe.Ruler (Efl.Ui.Layout)
class.constructor;
Efl.Object.constructor;
Efl.Object.destructor;
- Efl.Gfx.size { set; }
- Efl.Gfx.position { set; }
- Efl.Gfx.visible { set; }
+ Efl.Gfx.Entity.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.visible { set; }
Efl.Canvas.Group.group_calculate;
- Elm.Widget.theme_apply;
+ Efl.Ui.Widget.theme_apply;
}
events {
}