summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-06-21 13:24:13 +0900
committerHermet Park <hermetpark@gmail.com>2018-06-21 13:24:13 +0900
commit9779b5a17edbba5dcf215cf23cabdf260a648cb8 (patch)
treeb6167e892d25e509414b4a2d3bd8b27ffbd0918b
parentefad8510bd0164f5e69c9865ecbd40533f603148 (diff)
eflete: miscellaneous build fixesHEADmaster
Summary: eflete has not been built in a while and several pieces had broken: Constness of Eo getters. Rename "style" property to avoid conflict. Several Efl API name changes. Uses of efl_add() without parent. Test Plan: eflete can be built now and run for a while (haven't done any serious testing) audio tones can be played. Reviewers: rimmed, YOhoho, bu5hm4n Differential Revision: https://phab.enlightenment.org/D6331
-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 850b6f3..c990822 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
86 86
87 LAYOUT_PROP_ADD(ap.win, _("Color class name: "), "popup", "1swallow") 87 LAYOUT_PROP_ADD(ap.win, _("Color class name: "), "popup", "1swallow")
88 ENTRY_ADD(item, mng.entry, true); 88 ENTRY_ADD(item, mng.entry, true);
89 efl_event_callback_add(mng.entry, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, mng.name_validator); 89 efl_event_callback_add(mng.entry, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, mng.name_validator);
90 evas_object_smart_callback_add(mng.entry, signals.elm.entry.changed, _validation, popup); 90 evas_object_smart_callback_add(mng.entry, signals.elm.entry.changed, _validation, popup);
91 elm_object_part_text_set(mng.entry, "guide", _("Type new color class name here")); 91 elm_object_part_text_set(mng.entry, "guide", _("Type new color class name here"));
92 elm_object_part_content_set(item, "elm.swallow.content", mng.entry); 92 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 0322c65..c26b3b4 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
804 elm_box_padding_set(box, 0, 10); 804 elm_box_padding_set(box, 0, 10);
805 LAYOUT_PROP_ADD(box, _("Image set name:"), "popup", "1swallow") 805 LAYOUT_PROP_ADD(box, _("Image set name:"), "popup", "1swallow")
806 ENTRY_ADD(item, mng.image_set.entry, true); 806 ENTRY_ADD(item, mng.image_set.entry, true);
807 efl_event_callback_add(mng.image_set.entry, ELM_ENTRY_EVENT_VALIDATE, 807 efl_event_callback_add(mng.image_set.entry, EFL_UI_TEXT_EVENT_VALIDATE,
808 resource_name_validator_helper, mng.image_set.validator); 808 resource_name_validator_helper, mng.image_set.validator);
809 evas_object_smart_callback_add(mng.image_set.entry, signals.elm.entry.changed, _validation, popup); 809 evas_object_smart_callback_add(mng.image_set.entry, signals.elm.entry.changed, _validation, popup);
810 elm_object_part_text_set(mng.image_set.entry, "guide", _("Type a new image set name")); 810 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 8105a85..d3d6b95 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 **
460 LAYOUT_PROP_ADD(layout_p.box, _("Name"), "popup", "1swallow") 460 LAYOUT_PROP_ADD(layout_p.box, _("Name"), "popup", "1swallow")
461 ENTRY_ADD(layout_p.box, layout_p.entry, true) 461 ENTRY_ADD(layout_p.box, layout_p.entry, true)
462 evas_object_smart_callback_add(layout_p.entry, signals.elm.entry.changed, _group_validate, popup); 462 evas_object_smart_callback_add(layout_p.entry, signals.elm.entry.changed, _group_validate, popup);
463 efl_event_callback_add(layout_p.entry, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, validator); 463 efl_event_callback_add(layout_p.entry, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, validator);
464 elm_layout_content_set(item, NULL, layout_p.entry); 464 elm_layout_content_set(item, NULL, layout_p.entry);
465 elm_box_pack_end(layout_p.box, item); 465 elm_box_pack_end(layout_p.box, item);
466 glit = elm_genlist_selected_item_get(project_navigator.genlist); 466 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 f7898a3..8ec0126 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)
876 evas_object_smart_callback_add(action->control, signals.eflete.property.script_control.clicked, _btn_script_manager_cb, NULL); 876 evas_object_smart_callback_add(action->control, signals.eflete.property.script_control.clicked, _btn_script_manager_cb, NULL);
877 break; 877 break;
878 case ATTRIBUTE_PART_NAME: 878 case ATTRIBUTE_PART_NAME:
879 efl_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, group_pd.part_name_validator); 879 efl_event_callback_add(action->control, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, group_pd.part_name_validator);
880 break; 880 break;
881 case ATTRIBUTE_GROUP_DATA_NAME: 881 case ATTRIBUTE_GROUP_DATA_NAME:
882 efl_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, group_pd.group_data_name_validator); 882 efl_event_callback_add(action->control, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, group_pd.group_data_name_validator);
883 break; 883 break;
884 case ATTRIBUTE_STATE_IMAGE: 884 case ATTRIBUTE_STATE_IMAGE:
885 case ATTRIBUTE_STATE_VECTOR: 885 case ATTRIBUTE_STATE_VECTOR:
diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c
index fdbbad1..45c3fbb 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
372 elm_box_padding_set(box, 0, 10); 372 elm_box_padding_set(box, 0, 10);
373 LAYOUT_PROP_ADD(box, _("Tone name:"), "popup", "1swallow") 373 LAYOUT_PROP_ADD(box, _("Tone name:"), "popup", "1swallow")
374 ENTRY_ADD(item, mng.tone_entry, true); 374 ENTRY_ADD(item, mng.tone_entry, true);
375 efl_event_callback_add(mng.tone_entry, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, mng.tone_validator); 375 efl_event_callback_add(mng.tone_entry, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, mng.tone_validator);
376 evas_object_smart_callback_add(mng.tone_entry, signals.elm.entry.changed, _validation, popup); 376 evas_object_smart_callback_add(mng.tone_entry, signals.elm.entry.changed, _validation, popup);
377 elm_object_part_text_set(mng.tone_entry, "guide", _("Type a new tone name")); 377 elm_object_part_text_set(mng.tone_entry, "guide", _("Type a new tone name"));
378 elm_object_part_content_set(item, "elm.swallow.content", mng.tone_entry); 378 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
382 382
383 LAYOUT_PROP_ADD(box, _("Frequency:"), "popup", "1swallow") 383 LAYOUT_PROP_ADD(box, _("Frequency:"), "popup", "1swallow")
384 ENTRY_ADD(item, mng.frq_entry, true); 384 ENTRY_ADD(item, mng.frq_entry, true);
385 efl_event_callback_add(mng.frq_entry, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, mng.frq_validator); 385 efl_event_callback_add(mng.frq_entry, EFL_UI_TEXT_EVENT_VALIDATE, elm_validator_regexp_helper, mng.frq_validator);
386 evas_object_smart_callback_add(mng.frq_entry, signals.elm.entry.changed, _validation, popup); 386 evas_object_smart_callback_add(mng.frq_entry, signals.elm.entry.changed, _validation, popup);
387 /* force validator trigger */ 387 /* force validator trigger */
388 elm_entry_entry_set(mng.frq_entry, " "); 388 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 f5d317d..eac229e 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__,
157static void 157static void
158_create_io_stream() 158_create_io_stream()
159{ 159{
160 in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL); 160 in = efl_add_ref(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
161 assert(in != NULL); 161 assert(in != NULL);
162 out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL); 162 out = efl_add_ref(ECORE_AUDIO_OUT_PULSE_CLASS, NULL);
163 assert(out != NULL); 163 assert(out != NULL);
164 efl_event_callback_add(out, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, 164 efl_event_callback_add(out, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL,
165 _out_fail, NULL); 165 _out_fail, NULL);
@@ -177,7 +177,7 @@ _tone_play()
177 177
178 if (!in) 178 if (!in)
179 { 179 {
180 in = efl_add(ECORE_AUDIO_IN_TONE_CLASS, NULL); 180 in = efl_add_ref(ECORE_AUDIO_IN_TONE_CLASS, NULL);
181 ecore_audio_obj_name_set(in, tone->common.name); 181 ecore_audio_obj_name_set(in, tone->common.name);
182 efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &tone->freq); 182 efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &tone->freq);
183 ecore_audio_obj_in_length_set(in, TONE_PLAYING_DURATION); 183 ecore_audio_obj_in_length_set(in, TONE_PLAYING_DURATION);
@@ -186,7 +186,7 @@ _tone_play()
186 } 186 }
187 187
188 if (!out) 188 if (!out)
189 out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, 189 out = efl_add_ref(ECORE_AUDIO_OUT_PULSE_CLASS, NULL,
190 efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, 190 efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL,
191 _out_fail, NULL)); 191 _out_fail, NULL));
192 192
@@ -194,7 +194,6 @@ _tone_play()
194 if (!ret) 194 if (!ret)
195 { 195 {
196 ERR("Couldn't attach input and output!"); 196 ERR("Couldn't attach input and output!");
197 abort();
198 } 197 }
199 elm_slider_min_max_set(rewin, 0.0, TONE_PLAYING_DURATION); 198 elm_slider_min_max_set(rewin, 0.0, TONE_PLAYING_DURATION);
200 elm_slider_value_set(rewin, 0.0); 199 elm_slider_value_set(rewin, 0.0);
diff --git a/src/bin/ui/style_manager.c b/src/bin/ui/style_manager.c
index 5a41018..36cc286 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 **
189 LAYOUT_PROP_ADD(mng.win, _("Style name:"), "popup", "1swallow"); 189 LAYOUT_PROP_ADD(mng.win, _("Style name:"), "popup", "1swallow");
190 mng.popup.item = item; 190 mng.popup.item = item;
191 ENTRY_ADD(mng.popup.item, mng.popup.name, true); 191 ENTRY_ADD(mng.popup.item, mng.popup.name, true);
192 efl_event_callback_add(mng.popup.name, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, mng.popup.validator); 192 efl_event_callback_add(mng.popup.name, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, mng.popup.validator);
193 evas_object_smart_callback_add(mng.popup.name, signals.elm.entry.changed, _validate, popup); 193 evas_object_smart_callback_add(mng.popup.name, signals.elm.entry.changed, _validate, popup);
194 elm_object_part_text_set(mng.popup.name, "guide", _("Type a new style name")); 194 elm_object_part_text_set(mng.popup.name, "guide", _("Type a new style name"));
195 elm_object_part_content_set(mng.popup.item, "elm.swallow.content", mng.popup.name); 195 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
261 261
262 LAYOUT_PROP_ADD(mng.win, "Tag name:", "popup", "1swallow"); 262 LAYOUT_PROP_ADD(mng.win, "Tag name:", "popup", "1swallow");
263 ENTRY_ADD(item, mng.popup.name, true); 263 ENTRY_ADD(item, mng.popup.name, true);
264 efl_event_callback_add(mng.popup.name, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, mng.popup.validator); 264 efl_event_callback_add(mng.popup.name, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, mng.popup.validator);
265 evas_object_smart_callback_add(mng.popup.name, signals.elm.entry.changed, _validate, popup); 265 evas_object_smart_callback_add(mng.popup.name, signals.elm.entry.changed, _validate, popup);
266 elm_object_part_text_set(mng.popup.name, "guide", _("Type a new tag name.")); 266 elm_object_part_text_set(mng.popup.name, "guide", _("Type a new tag name."));
267 elm_object_part_content_set(item, "elm.swallow.content", mng.popup.name); 267 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 f8c303d..dc225f6 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)
517 /* label.name */ 517 /* label.name */
518 LAYOUT_PROP_ADD(tab_edc.box, _("Project name:"), "tab_home", "item") 518 LAYOUT_PROP_ADD(tab_edc.box, _("Project name:"), "tab_home", "item")
519 ENTRY_ADD(item, tab_edc.name, true) 519 ENTRY_ADD(item, tab_edc.name, true)
520 efl_event_callback_add(tab_edc.name, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, tab_edc.name_validator); 520 efl_event_callback_add(tab_edc.name, EFL_UI_TEXT_EVENT_VALIDATE, elm_validator_regexp_helper, tab_edc.name_validator);
521 evas_object_smart_callback_add(tab_edc.name, signals.elm.entry.changed, _validate, NULL); 521 evas_object_smart_callback_add(tab_edc.name, signals.elm.entry.changed, _validate, NULL);
522 elm_layout_content_set(item, NULL, tab_edc.name); 522 elm_layout_content_set(item, NULL, tab_edc.name);
523 elm_box_pack_end(tab_edc.box, item); 523 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 e7389a7..45a371c 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)
571 /* label.name */ 571 /* label.name */
572 elm_object_part_text_set(tab_edj.layout, "label.name", _("Project name:")); 572 elm_object_part_text_set(tab_edj.layout, "label.name", _("Project name:"));
573 ENTRY_ADD(tab_edj.layout, tab_edj.name, true) 573 ENTRY_ADD(tab_edj.layout, tab_edj.name, true)
574 efl_event_callback_add(tab_edj.name, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, tab_edj.name_validator); 574 efl_event_callback_add(tab_edj.name, EFL_UI_TEXT_EVENT_VALIDATE, elm_validator_regexp_helper, tab_edj.name_validator);
575 evas_object_smart_callback_add(tab_edj.name, signals.elm.entry.changed, _name_changed_cb, NULL); 575 evas_object_smart_callback_add(tab_edj.name, signals.elm.entry.changed, _name_changed_cb, NULL);
576 elm_object_part_content_set(tab_edj.layout, "swallow.name", tab_edj.name); 576 elm_object_part_content_set(tab_edj.layout, "swallow.name", tab_edj.name);
577 /* label.path */ 577 /* label.path */
diff --git a/src/bin/ui/tab_home_new.c b/src/bin/ui/tab_home_new.c
index 88a25a7..3c05520 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)
629 /* label.name */ 629 /* label.name */
630 elm_object_part_text_set(tab_new.layout, "label.name", _("Project name:")); 630 elm_object_part_text_set(tab_new.layout, "label.name", _("Project name:"));
631 ENTRY_ADD(tab_new.layout, tab_new.name, true) 631 ENTRY_ADD(tab_new.layout, tab_new.name, true)
632 efl_event_callback_add(tab_new.name, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, tab_new.name_validator); 632 efl_event_callback_add(tab_new.name, EFL_UI_TEXT_EVENT_VALIDATE, elm_validator_regexp_helper, tab_new.name_validator);
633 evas_object_smart_callback_add(tab_new.name, signals.elm.entry.changed, _validate, NULL); 633 evas_object_smart_callback_add(tab_new.name, signals.elm.entry.changed, _validate, NULL);
634 elm_object_part_content_set(tab_new.layout, "swallow.name", tab_new.name); 634 elm_object_part_content_set(tab_new.layout, "swallow.name", tab_new.name);
635 /* label.path */ 635 /* label.path */
diff --git a/src/bin/ui/workspace/group_navigator.c b/src/bin/ui/workspace/group_navigator.c
index 63996b3..d7e7ae9 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
1124 1124
1125 LAYOUT_PROP_ADD(box, _("Part name"), "popup", "1swallow") 1125 LAYOUT_PROP_ADD(box, _("Part name"), "popup", "1swallow")
1126 ENTRY_ADD(box, pl->popup.entry_name, true); 1126 ENTRY_ADD(box, pl->popup.entry_name, true);
1127 efl_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, pl->part_name_validator); 1127 efl_event_callback_add(pl->popup.entry_name, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, pl->part_name_validator);
1128 elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter the name of the new part")); 1128 elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter the name of the new part"));
1129 resource_name_validator_list_set(pl->part_name_validator, &pl->group->parts, false); 1129 resource_name_validator_list_set(pl->part_name_validator, &pl->group->parts, false);
1130 evas_object_smart_callback_add(pl->popup.entry_name, signals.elm.entry.changed, _on_part_name_changed, pl); 1130 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
1256 1256
1257 LAYOUT_PROP_ADD(box, _("Data item name"), "popup", "1swallow") 1257 LAYOUT_PROP_ADD(box, _("Data item name"), "popup", "1swallow")
1258 ENTRY_ADD(box, pl->popup.entry_name, true); 1258 ENTRY_ADD(box, pl->popup.entry_name, true);
1259 efl_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, pl->group_data_name_validator); 1259 efl_event_callback_add(pl->popup.entry_name, EFL_UI_TEXT_EVENT_VALIDATE, resource_name_validator_helper, pl->group_data_name_validator);
1260 elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter the name of the new group_data")); 1260 elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter the name of the new group_data"));
1261 resource_name_validator_list_set(pl->group_data_name_validator, &pl->group->data_items, false); 1261 resource_name_validator_list_set(pl->group_data_name_validator, &pl->group->data_items, false);
1262 evas_object_smart_callback_add(pl->popup.entry_name, signals.elm.entry.changed, _on_group_data_name_changed, pl); 1262 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 **
1395 1395
1396 LAYOUT_PROP_ADD(box, _("State name"), "popup", "1swallow"); 1396 LAYOUT_PROP_ADD(box, _("State name"), "popup", "1swallow");
1397 ENTRY_ADD(item, pl->popup.entry_name, true); 1397 ENTRY_ADD(item, pl->popup.entry_name, true);
1398 efl_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE, 1398 efl_event_callback_add(pl->popup.entry_name, EFL_UI_TEXT_EVENT_VALIDATE,
1399 elm_validator_regexp_helper, pl->name_validator); 1399 elm_validator_regexp_helper, pl->name_validator);
1400 evas_object_smart_callback_add(pl->popup.entry_name, signals.elm.entry.changed, _state_validate, pl); 1400 evas_object_smart_callback_add(pl->popup.entry_name, signals.elm.entry.changed, _state_validate, pl);
1401 elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter the name of the new state")); 1401 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
1545 1545
1546 LAYOUT_PROP_ADD(box, _("Name"), "popup", "1swallow") 1546 LAYOUT_PROP_ADD(box, _("Name"), "popup", "1swallow")
1547 ENTRY_ADD(item, pl->popup.entry_name, true); 1547 ENTRY_ADD(item, pl->popup.entry_name, true);
1548 efl_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE, 1548 efl_event_callback_add(pl->popup.entry_name, EFL_UI_TEXT_EVENT_VALIDATE,
1549 elm_validator_regexp_helper, pl->name_validator); 1549 elm_validator_regexp_helper, pl->name_validator);
1550 evas_object_smart_callback_add(pl->popup.entry_name, signals.elm.entry.changed, _item_validate, pl); 1550 evas_object_smart_callback_add(pl->popup.entry_name, signals.elm.entry.changed, _item_validate, pl);
1551 elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter the name of the new item")); 1551 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
1676 1676
1677 LAYOUT_PROP_ADD(box, _("Program name"), "popup", "1swallow") 1677 LAYOUT_PROP_ADD(box, _("Program name"), "popup", "1swallow")
1678 ENTRY_ADD(item, pl->popup.entry_name, true); 1678 ENTRY_ADD(item, pl->popup.entry_name, true);
1679 efl_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE, 1679 efl_event_callback_add(pl->popup.entry_name, EFL_UI_TEXT_EVENT_VALIDATE,
1680 resource_name_validator_helper, pl->program_name_validator); 1680 resource_name_validator_helper, pl->program_name_validator);
1681 resource_name_validator_list_set(pl->program_name_validator, &pl->group->programs, false); 1681 resource_name_validator_list_set(pl->program_name_validator, &pl->group->programs, false);
1682 evas_object_smart_callback_add(pl->popup.entry_name, signals.elm.entry.changed, _program_validate, pl); 1682 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 c5b114d..fd5b731 100644
--- a/src/lib/ewe_private.h
+++ b/src/lib/ewe_private.h
@@ -18,7 +18,7 @@
18#ifndef EWE_PRIVATE_H 18#ifndef EWE_PRIVATE_H
19#define EWE_PRIVATE_H 19#define EWE_PRIVATE_H
20 20
21#define ELM_WIDGET_PROTECTED 21#define EFL_UI_WIDGET_PROTECTED
22#define EFL_CANVAS_OBJECT_PROTECTED 22#define EFL_CANVAS_OBJECT_PROTECTED
23#define EFL_CANVAS_GROUP_PROTECTED 23#define EFL_CANVAS_GROUP_PROTECTED
24#define EFL_CANVAS_GROUP_BETA 24#define EFL_CANVAS_GROUP_BETA
@@ -33,7 +33,6 @@
33#include <Eo.h> 33#include <Eo.h>
34#include <Evas.h> 34#include <Evas.h>
35#include <Elementary.h> 35#include <Elementary.h>
36#include <elm_widget.h>
37#include <elm_widget_layout.h> 36#include <elm_widget_layout.h>
38#include <elm_interface_scrollable.h> 37#include <elm_interface_scrollable.h>
39 38
diff --git a/src/lib/ewe_ruler.c b/src/lib/ewe_ruler.c
index e2caf26..a9194b8 100644
--- a/src/lib/ewe_ruler.c
+++ b/src/lib/ewe_ruler.c
@@ -258,7 +258,7 @@ _ewe_ruler_horizontal_set(Eo *obj,
258} 258}
259 259
260EOLIAN static Eina_Bool 260EOLIAN static Eina_Bool
261_ewe_ruler_horizontal_get(Eo *obj EINA_UNUSED, Ewe_Ruler_Smart_Data *sd) 261_ewe_ruler_horizontal_get(const Eo *obj EINA_UNUSED, Ewe_Ruler_Smart_Data *sd)
262{ 262{
263 return sd->horizontal; 263 return sd->horizontal;
264} 264}
@@ -285,7 +285,7 @@ _ewe_ruler_step_set(Eo *obj,
285} 285}
286 286
287EOLIAN static unsigned int 287EOLIAN static unsigned int
288_ewe_ruler_step_get(Eo *obj EINA_UNUSED, 288_ewe_ruler_step_get(const Eo *obj EINA_UNUSED,
289 Ewe_Ruler_Smart_Data *sd, 289 Ewe_Ruler_Smart_Data *sd,
290 Ewe_Ruler_Scale *scale) 290 Ewe_Ruler_Scale *scale)
291{ 291{
@@ -309,7 +309,7 @@ _ewe_ruler_value_step_set(Eo *obj,
309} 309}
310 310
311EOLIAN static double 311EOLIAN static double
312_ewe_ruler_value_step_get(Eo *obj EINA_UNUSED, 312_ewe_ruler_value_step_get(const Eo *obj EINA_UNUSED,
313 Ewe_Ruler_Smart_Data *sd, 313 Ewe_Ruler_Smart_Data *sd,
314 Ewe_Ruler_Scale *scale) 314 Ewe_Ruler_Scale *scale)
315{ 315{
@@ -335,7 +335,7 @@ _ewe_ruler_zero_offset_set(Eo *obj,
335} 335}
336 336
337EOLIAN static int 337EOLIAN static int
338_ewe_ruler_zero_offset_get(Eo *obj EINA_UNUSED, 338_ewe_ruler_zero_offset_get(const Eo *obj EINA_UNUSED,
339 Ewe_Ruler_Smart_Data *sd, 339 Ewe_Ruler_Smart_Data *sd,
340 Ewe_Ruler_Scale *scale) 340 Ewe_Ruler_Scale *scale)
341{ 341{
@@ -361,7 +361,7 @@ _ewe_ruler_format_set(Eo *obj,
361} 361}
362 362
363EOLIAN static const char * 363EOLIAN static const char *
364_ewe_ruler_format_get(Eo *obj EINA_UNUSED, 364_ewe_ruler_format_get(const Eo *obj EINA_UNUSED,
365 Ewe_Ruler_Smart_Data *sd, 365 Ewe_Ruler_Smart_Data *sd,
366 Ewe_Ruler_Scale *scale) 366 Ewe_Ruler_Scale *scale)
367{ 367{
@@ -371,10 +371,10 @@ _ewe_ruler_format_get(Eo *obj EINA_UNUSED,
371} 371}
372 372
373EOLIAN static Eina_Bool 373EOLIAN static Eina_Bool
374_ewe_ruler_style_set(Eo *obj, 374_ewe_ruler_scale_style_set(Eo *obj,
375 Ewe_Ruler_Smart_Data *sd, 375 Ewe_Ruler_Smart_Data *sd,
376 Ewe_Ruler_Scale *scale, 376 Ewe_Ruler_Scale *scale,
377 const char *style) 377 const char *style)
378{ 378{
379 if (!scale) scale = eina_list_data_get(sd->scales); 379 if (!scale) scale = eina_list_data_get(sd->scales);
380 if (!scale) return EINA_FALSE; 380 if (!scale) return EINA_FALSE;
@@ -394,9 +394,9 @@ _ewe_ruler_style_set(Eo *obj,
394} 394}
395 395
396EOLIAN static const char * 396EOLIAN static const char *
397_ewe_ruler_style_get(Eo *obj EINA_UNUSED, 397_ewe_ruler_scale_style_get(const Eo *obj EINA_UNUSED,
398 Ewe_Ruler_Smart_Data *sd, 398 Ewe_Ruler_Smart_Data *sd,
399 Ewe_Ruler_Scale *scale) 399 Ewe_Ruler_Scale *scale)
400{ 400{
401 if (!scale) scale = eina_list_data_get(sd->scales); 401 if (!scale) scale = eina_list_data_get(sd->scales);
402 if (!scale) return 0; 402 if (!scale) return 0;
@@ -453,7 +453,7 @@ _ewe_ruler_scale_del(Eo *obj EINA_UNUSED,
453} 453}
454 454
455EOLIAN static Eina_Bool 455EOLIAN static Eina_Bool
456_ewe_ruler_scale_visible_get(Eo *obj EINA_UNUSED, 456_ewe_ruler_scale_visible_get(const Eo *obj EINA_UNUSED,
457 Ewe_Ruler_Smart_Data *sd, 457 Ewe_Ruler_Smart_Data *sd,
458 Ewe_Ruler_Scale *scale) 458 Ewe_Ruler_Scale *scale)
459{ 459{
@@ -495,7 +495,7 @@ _ewe_ruler_scale_visible_set(Eo *obj EINA_UNUSED,
495} 495}
496 496
497EOLIAN static Eina_Bool 497EOLIAN static Eina_Bool
498_ewe_ruler_scale_middle_mark_get(Eo *obj EINA_UNUSED, 498_ewe_ruler_scale_middle_mark_get(const Eo *obj EINA_UNUSED,
499 Ewe_Ruler_Smart_Data *sd, 499 Ewe_Ruler_Smart_Data *sd,
500 Ewe_Ruler_Scale *scale) 500 Ewe_Ruler_Scale *scale)
501{ 501{
@@ -597,7 +597,7 @@ _ewe_ruler_marker_size_set(Eo *obj,
597} 597}
598 598
599EOLIAN static int 599EOLIAN static int
600_ewe_ruler_marker_size_get(Eo *obj EINA_UNUSED, 600_ewe_ruler_marker_size_get(const Eo *obj EINA_UNUSED,
601 Ewe_Ruler_Smart_Data *sd EINA_UNUSED, 601 Ewe_Ruler_Smart_Data *sd EINA_UNUSED,
602 Ewe_Ruler_Marker *marker) 602 Ewe_Ruler_Marker *marker)
603{ 603{
@@ -614,7 +614,7 @@ _ewe_ruler_marker_text_set(Eo *obj EINA_UNUSED,
614} 614}
615 615
616EOLIAN static const char * 616EOLIAN static const char *
617_ewe_ruler_marker_text_get(Eo *obj EINA_UNUSED, 617_ewe_ruler_marker_text_get(const Eo *obj EINA_UNUSED,
618 Ewe_Ruler_Smart_Data *sd EINA_UNUSED, 618 Ewe_Ruler_Smart_Data *sd EINA_UNUSED,
619 Ewe_Ruler_Marker *marker) 619 Ewe_Ruler_Marker *marker)
620{ 620{
@@ -668,7 +668,7 @@ _ewe_ruler_marker_relative_set(Eo *obj,
668} 668}
669 669
670EOLIAN static double 670EOLIAN static double
671_ewe_ruler_marker_relative_get(Eo *obj EINA_UNUSED, 671_ewe_ruler_marker_relative_get(const Eo *obj EINA_UNUSED,
672 Ewe_Ruler_Smart_Data *sd, 672 Ewe_Ruler_Smart_Data *sd,
673 Ewe_Ruler_Marker *marker, 673 Ewe_Ruler_Marker *marker,
674 Ewe_Ruler_Scale *scale) 674 Ewe_Ruler_Scale *scale)
@@ -709,7 +709,7 @@ _ewe_ruler_marker_absolute_set(Eo *obj,
709} 709}
710 710
711EOLIAN static int 711EOLIAN static int
712_ewe_ruler_marker_absolute_get(Eo *obj EINA_UNUSED, 712_ewe_ruler_marker_absolute_get(const Eo *obj EINA_UNUSED,
713 Ewe_Ruler_Smart_Data *sd EINA_UNUSED, 713 Ewe_Ruler_Smart_Data *sd EINA_UNUSED,
714 Ewe_Ruler_Marker *marker) 714 Ewe_Ruler_Marker *marker)
715{ 715{
@@ -721,7 +721,7 @@ _ewe_ruler_marker_absolute_get(Eo *obj EINA_UNUSED,
721} 721}
722 722
723EOLIAN static Eina_Bool 723EOLIAN static Eina_Bool
724_ewe_ruler_marker_visible_get(Eo *obj EINA_UNUSED, 724_ewe_ruler_marker_visible_get(const Eo *obj EINA_UNUSED,
725 Ewe_Ruler_Smart_Data *sd EINA_UNUSED, 725 Ewe_Ruler_Smart_Data *sd EINA_UNUSED,
726 Ewe_Ruler_Marker *marker) 726 Ewe_Ruler_Marker *marker)
727{ 727{
@@ -772,7 +772,7 @@ _ewe_ruler_marker_style_set(Eo *obj,
772} 772}
773 773
774EOLIAN static const char * 774EOLIAN static const char *
775_ewe_ruler_marker_style_get(Eo *obj EINA_UNUSED, 775_ewe_ruler_marker_style_get(const Eo *obj EINA_UNUSED,
776 Ewe_Ruler_Smart_Data *sd EINA_UNUSED, 776 Ewe_Ruler_Smart_Data *sd EINA_UNUSED,
777 Ewe_Ruler_Marker *marker) 777 Ewe_Ruler_Marker *marker)
778{ 778{
@@ -786,7 +786,7 @@ static void
786_ewe_ruler_show(Eo* obj, Ewe_Ruler_Smart_Data *sd) 786_ewe_ruler_show(Eo* obj, Ewe_Ruler_Smart_Data *sd)
787{ 787{
788 if (sd->ruler_visible) return; 788 if (sd->ruler_visible) return;
789 efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE); 789 efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE);
790 790
791 Ewe_Ruler_Scale *scale; 791 Ewe_Ruler_Scale *scale;
792 Ewe_Ruler_Marker *marker; 792 Ewe_Ruler_Marker *marker;
@@ -823,7 +823,7 @@ static void
823_ewe_ruler_hide(Eo* obj, Ewe_Ruler_Smart_Data *sd) 823_ewe_ruler_hide(Eo* obj, Ewe_Ruler_Smart_Data *sd)
824{ 824{
825 if (!sd->ruler_visible) return; 825 if (!sd->ruler_visible) return;
826 efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE); 826 efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE);
827 827
828 Ewe_Ruler_Scale *scale; 828 Ewe_Ruler_Scale *scale;
829 Ewe_Ruler_Marker *marker; 829 Ewe_Ruler_Marker *marker;
@@ -847,7 +847,7 @@ _ewe_ruler_hide(Eo* obj, Ewe_Ruler_Smart_Data *sd)
847} 847}
848 848
849EOLIAN static void 849EOLIAN static void
850_ewe_ruler_efl_gfx_visible_set(Eo *obj, Ewe_Ruler_Smart_Data *sd, Eina_Bool vis) 850_ewe_ruler_efl_gfx_entity_visible_set(Eo *obj, Ewe_Ruler_Smart_Data *sd, Eina_Bool vis)
851{ 851{
852 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis)) 852 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
853 return; 853 return;
@@ -859,14 +859,14 @@ _ewe_ruler_efl_gfx_visible_set(Eo *obj, Ewe_Ruler_Smart_Data *sd, Eina_Bool vis)
859} 859}
860 860
861EOLIAN static void 861EOLIAN static void
862_ewe_ruler_efl_gfx_position_set(Eo *obj, 862_ewe_ruler_efl_gfx_entity_position_set(Eo *obj,
863 Ewe_Ruler_Smart_Data *sd, 863 Ewe_Ruler_Smart_Data *sd,
864 Eina_Position2D pos) 864 Eina_Position2D pos)
865{ 865{
866 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) 866 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
867 return; 867 return;
868 868
869 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos); 869 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
870 evas_object_move(obj, pos.x, pos.y); 870 evas_object_move(obj, pos.x, pos.y);
871 871
872 evas_object_move(sd->clip, pos.x, pos.y); 872 evas_object_move(sd->clip, pos.x, pos.y);
@@ -879,7 +879,7 @@ _ewe_ruler_efl_gfx_position_set(Eo *obj,
879} 879}
880 880
881EOLIAN static void 881EOLIAN static void
882_ewe_ruler_efl_gfx_size_set(Eo *obj, 882_ewe_ruler_efl_gfx_entity_size_set(Eo *obj,
883 Ewe_Ruler_Smart_Data *sd, 883 Ewe_Ruler_Smart_Data *sd,
884 Eina_Size2D size) 884 Eina_Size2D size)
885{ 885{
@@ -896,7 +896,7 @@ _ewe_ruler_efl_gfx_size_set(Eo *obj,
896 896
897 evas_object_smart_changed(obj); 897 evas_object_smart_changed(obj);
898 898
899 efl_gfx_size_set(efl_super(obj, MY_CLASS), size); 899 efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), size);
900} 900}
901 901
902EOLIAN static void 902EOLIAN static void
@@ -954,11 +954,11 @@ _ewe_ruler_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED,
954} 954}
955 955
956EOLIAN static Efl_Ui_Theme_Apply 956EOLIAN static Efl_Ui_Theme_Apply
957_ewe_ruler_elm_widget_theme_apply(Eo *obj, Ewe_Ruler_Smart_Data *sd) 957_ewe_ruler_efl_ui_widget_theme_apply(Eo *obj, Ewe_Ruler_Smart_Data *sd)
958{ 958{
959 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 959 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
960 int count; 960 int count;
961 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 961 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
962 if (int_ret == EFL_UI_THEME_APPLY_FAILED) return EFL_UI_THEME_APPLY_FAILED; 962 if (int_ret == EFL_UI_THEME_APPLY_FAILED) return EFL_UI_THEME_APPLY_FAILED;
963 963
964 Ewe_Ruler_Scale *scale; 964 Ewe_Ruler_Scale *scale;
diff --git a/src/lib/ewe_ruler.eo b/src/lib/ewe_ruler.eo
index bf791e0..cb68476 100644
--- a/src/lib/ewe_ruler.eo
+++ b/src/lib/ewe_ruler.eo
@@ -1,7 +1,7 @@
1type Ewe_Ruler_Scale: __undefined_type; 1type Ewe_Ruler_Scale: __undefined_type;
2type Ewe_Ruler_Marker: __undefined_type; 2type Ewe_Ruler_Marker: __undefined_type;
3 3
4class Ewe.Ruler (Efl.Ui.Layout) 4class Ewe.Ruler (Efl.Ui.Layout.Object)
5{ 5{
6 eo_prefix: ewe_obj_ruler; 6 eo_prefix: ewe_obj_ruler;
7 legacy_prefix: ewe_ruler; 7 legacy_prefix: ewe_ruler;
@@ -91,7 +91,7 @@ class Ewe.Ruler (Efl.Ui.Layout)
91 format: string; 91 format: string;
92 } 92 }
93 } 93 }
94 @property style { 94 @property scale_style {
95 get { 95 get {
96 [[ 96 [[
97 Get style of given scale. 97 Get style of given scale.
@@ -101,7 +101,7 @@ class Ewe.Ruler (Efl.Ui.Layout)
101 [[ 101 [[
102 Set style for given scale 102 Set style for given scale
103 ]] 103 ]]
104 return: bool; [[EINA_TRUE if style was setted or EINA_FALSE on failure.]] 104 return: bool; [[EINA_TRUE if style was set or EINA_FALSE on failure.]]
105 } 105 }
106 keys { 106 keys {
107 scale: ptr(Ewe_Ruler_Scale); 107 scale: ptr(Ewe_Ruler_Scale);
@@ -315,11 +315,11 @@ class Ewe.Ruler (Efl.Ui.Layout)
315 class.constructor; 315 class.constructor;
316 Efl.Object.constructor; 316 Efl.Object.constructor;
317 Efl.Object.destructor; 317 Efl.Object.destructor;
318 Efl.Gfx.size { set; } 318 Efl.Gfx.Entity.size { set; }
319 Efl.Gfx.position { set; } 319 Efl.Gfx.Entity.position { set; }
320 Efl.Gfx.visible { set; } 320 Efl.Gfx.Entity.visible { set; }
321 Efl.Canvas.Group.group_calculate; 321 Efl.Canvas.Group.group_calculate;
322 Elm.Widget.theme_apply; 322 Efl.Ui.Widget.theme_apply;
323 } 323 }
324 events { 324 events {
325 } 325 }