yakov pushed a commit to branch master. http://git.enlightenment.org/tools/erigo.git/commit/?id=17135f4e4dfc51a14577aacf541f6dcd7fb2a754
commit 17135f4e4dfc51a14577aacf541f6dcd7fb2a754 Author: Yakov Goldberg <[email protected]> Date: Sun Apr 10 11:48:47 2016 +0300 Adaptation according to changes in Elementary --- data/config/egui_all.eo | 2 +- data/config/simple_op_db.txt | 24 ++++-------------------- data/layouts/factory.json | 2 +- src/bin/gui/cbview.c | 2 +- src/bin/gui/descview.c | 2 +- src/bin/gui/editor.c | 9 ++++----- src/bin/gui/prop_layout.c | 2 +- src/bin/gui/props_helper.c | 2 +- src/bin/gui/rmview.c | 1 - src/bin/gui/settings_view.c | 4 ++-- src/bin/gui/simple_propview.c | 8 ++++---- 11 files changed, 20 insertions(+), 38 deletions(-) diff --git a/data/config/egui_all.eo b/data/config/egui_all.eo index 746210e..a80d745 100644 --- a/data/config/egui_all.eo +++ b/data/config/egui_all.eo @@ -1,3 +1,3 @@ -class EGUI_ALL (Elm.Win, Elm.Bg, Elm.Box, Elm.Table, Elm.Menu, Elm.Diskselector, Elm.Ctxpopup, Elm.Actionslider, Elm.Bubble, Elm.Button, Elm.Calendar, Elm.Check, Elm.Radio, Elm.Clock, Elm.Colorselector, Elm.Image, Elm.Icon, Elm.Label, Elm.Entry, Elm.Flip, Elm.Genlist, Elm.Gengrid, Elm.Dayselector, Elm.Toolbar, Elm.Layout, Elm.Scroller, Elm.Panes, Elm.Fileselector_Button, Elm.Fileselector_Entry, Elm.Fileselector, Elm.Frame, Elm.Grid, Elm.Panel, Elm.Separator, Elm.Hoversel, Evas.Image, Elm [...] +class EGUI_ALL (Elm.Win, Elm.Bg, Elm.Box, Elm.Table, Elm.Menu, Elm.Diskselector, Elm.Ctxpopup, Elm.Actionslider, Elm.Bubble, Elm.Button, Elm.Calendar, Elm.Check, Elm.Radio, Elm.Clock, Elm.Colorselector, Elm.Image, Elm.Icon, Elm.Label, Elm.Entry, Elm.Flip, Elm.Genlist, Elm.Gengrid, Elm.Dayselector, Elm.Toolbar, Elm.Layout, Elm.Scroller, Elm.Panes, Elm.Fileselector_Button, Elm.Fileselector_Entry, Elm.Fileselector, Elm.Frame, Elm.Grid, Elm.Panel, Elm.Separator, Elm.Hoversel, Evas.Image, Elm [...] { } diff --git a/data/config/simple_op_db.txt b/data/config/simple_op_db.txt index 9a3d33d..45bbb25 100644 --- a/data/config/simple_op_db.txt +++ b/data/config/simple_op_db.txt @@ -49,12 +49,10 @@ Component_Specific_Properties.Autorepeat_Gap_Timeout { Elm.Button.autorepeat_gap_timeout; } -Component_Specific_Properties.UI_Component_Specification.Horizontal { +UI_Component_Specification.Horizontal { Elm.Box.horizontal; Elm.Toolbar.horizontal; - Elm.Slider.horizontal; Elm.Panes.horizontal; - Elm.Progressbar.horizontal; Elm.Hoversel.horizontal; Elm.Separator.horizontal; } @@ -89,19 +87,10 @@ Component_Specific_Properties.Padding { Component_Specific_Properties.Image_Path { Efl.File.file(%0, NULL) for Elm.Image, Elm.Icon, Elm.Entry, Elm.Bg; } -Component_Specific_Properties.No_Scale { - none Elm.Icon; - Elm.Image.no_scale; -} -Component_Specific_Properties.Resizable { +UI_Component_Specification.Orientation { none Elm.Icon; - Elm.Image.resizable; -} - -Component_Specific_Properties.Orientation { - none Elm.Icon; - Efl.Image.orientation; + Efl.Orientation.orientation; } Component_Specific_Properties.Aspect_Fixed { @@ -191,8 +180,7 @@ Component_Specific_Properties.Min_Max { } Component_Specific_Properties.Value { - Elm.Slider.value; - Elm.Progressbar.value; + Efl.Ui.Progress.progress_value; } Component_Specific_Properties.Step { @@ -207,10 +195,6 @@ Component_Specific_Properties.Span_Size { Elm.Progressbar.span_size; } -Component_Specific_Properties.Inverted { - Elm.Progressbar.inverted; -} - Component_Specific_Properties.Collapse { Elm.Frame.collapse; } diff --git a/data/layouts/factory.json b/data/layouts/factory.json index b17027a..4d94b2b 100644 --- a/data/layouts/factory.json +++ b/data/layouts/factory.json @@ -317,7 +317,7 @@ }, "Properties": { - "Elm.Progressbar.value":[0.35], + "Efl.Ui.Progress.progress_value":[0.35], "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[165, 30] diff --git a/src/bin/gui/cbview.c b/src/bin/gui/cbview.c index b219ec1..c702d01 100644 --- a/src/bin/gui/cbview.c +++ b/src/bin/gui/cbview.c @@ -351,7 +351,7 @@ _action_prop_update(void *data, Eo *obj, void *event_info) } if (kl == ELM_CHECK_CLASS) { - Eina_Bool state = elm_obj_check_state_get(obj); + Eina_Bool state = efl_ui_check_selected_get(obj); gui_value_bool_set(val, state); } if (kl == ELM_HOVERSEL_CLASS) diff --git a/src/bin/gui/descview.c b/src/bin/gui/descview.c index a240fd7..4c70e2c 100644 --- a/src/bin/gui/descview.c +++ b/src/bin/gui/descview.c @@ -35,7 +35,7 @@ _wdg_public_change_cb(void *data, const Eo_Event *event) Gui_Widget *wdg = data; Eo *obj = event->obj; Eina_Bool new_state, old_state; - new_state = elm_obj_check_state_get(obj); + new_state = efl_ui_check_selected_get(obj); old_state = wdg_public_get(wdg); wdg_public_set(wdg, new_state); diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c index 0ee48c6..f7e1107 100644 --- a/src/bin/gui/editor.c +++ b/src/bin/gui/editor.c @@ -991,7 +991,6 @@ _marker_mouse_in(void *data, const Eo_Event *event) { cur_logo = eo_add(ELM_IMAGE_CLASS, (Eo *) base_obj); efl_gfx_size_set(cur_logo, sz, sz); - elm_obj_image_resizable_set(cur_logo, EINA_TRUE, EINA_TRUE); efl_file_set(cur_logo, EGUI_LAYOUT_IMAGES_PATH"/resize_red.png", NULL); eo_key_data_set((Eo *) base_obj, "cursor", cur_logo); @@ -3520,12 +3519,12 @@ _prop_update_from_propview_int(void *data EINA_UNUSED, Eo *obj, const Eo_Event_D if (kl == ELM_CHECK_CLASS) { Eina_Bool state; - state = elm_obj_check_state_get(obj); + state = efl_ui_check_selected_get(obj); gui_value_bool_set(val, state); } if (kl == ELM_SLIDER_CLASS) { - double num = elm_obj_slider_value_get(obj); + double num = efl_ui_progress_value_get(obj); Param_Default_Value *def_val = NULL; def_val = eo_key_data_get(obj, _DEFAULT_VALUE); if (def_val) @@ -3705,7 +3704,7 @@ _default_hover_selected_cb(void *data, const Eo_Event *event) } else if (eo_class_get(handler) == ELM_SLIDER_CLASS) { - elm_obj_slider_value_set(handler, atof(param_default_value_get(def_val))); + efl_ui_progress_value_set(handler, atof(param_default_value_get(def_val))); eo_key_data_set(handler, _DEFAULT_VALUE, def_val); } break; @@ -3783,7 +3782,7 @@ _item_public_update_cb(void *data, const Eo_Event *event) Gui_Widget *wdg = (Gui_Widget *) _editor_wdg_selected_get(); Item_Container_Item *item = data, *new_item; - state = elm_obj_check_state_get(event->obj); + state = efl_ui_check_selected_get(event->obj); new_item = item_container_item_copy(item); item_container_item_public_set(new_item, state); diff --git a/src/bin/gui/prop_layout.c b/src/bin/gui/prop_layout.c index a12ae1b..75348bb 100644 --- a/src/bin/gui/prop_layout.c +++ b/src/bin/gui/prop_layout.c @@ -70,7 +70,7 @@ Eina_Bool _expert_simple_mode_toggle_changed(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) { Eo *obj = event->obj; - Eina_Bool state = elm_obj_check_state_get(obj); + Eina_Bool state = efl_ui_check_selected_get(obj); Egui_Layout_Widgets *g = egui_layout_gui_get(); const Gui_Context *ctx = _active_context_get(); if (!ctx) return EINA_TRUE; diff --git a/src/bin/gui/props_helper.c b/src/bin/gui/props_helper.c index 7809e8f..297e51e 100644 --- a/src/bin/gui/props_helper.c +++ b/src/bin/gui/props_helper.c @@ -290,7 +290,7 @@ props_check_add(Eo *box, Eina_Bool state) { Eo *ck = eo_add(ELM_CHECK_CLASS, box); efl_gfx_visible_set(ck, EINA_TRUE); - elm_obj_check_state_set(ck, state); + efl_ui_check_selected_set(ck, state); elm_obj_box_pack_end(box, ck); return ck; diff --git a/src/bin/gui/rmview.c b/src/bin/gui/rmview.c index ee1b9b8..fbb80e5 100644 --- a/src/bin/gui/rmview.c +++ b/src/bin/gui/rmview.c @@ -607,7 +607,6 @@ _rmview_build(Rmview_Resource_Type type) Eo *icon = elm_image_add(g_rm_win->rm_table); efl_file_set(icon, EGUI_LAYOUT_IMAGES_PATH"/enventor_icon.png", NULL); evas_obj_size_hint_min_set(icon, 25, 25); - elm_obj_image_resizable_set(icon, EINA_TRUE, EINA_TRUE); efl_gfx_visible_set(icon, EINA_TRUE); bt = _rmview_button_add(g_rm_win->rm_table, ""); elm_obj_container_content_set(bt, "icon", icon); diff --git a/src/bin/gui/settings_view.c b/src/bin/gui/settings_view.c index 039a04d..6b89cfb 100644 --- a/src/bin/gui/settings_view.c +++ b/src/bin/gui/settings_view.c @@ -226,7 +226,7 @@ _start_pt_chk_chg(void *data, const Eo_Event *event) { Eid *wdg_id = data; Eo *obj = event->obj; - Eina_Bool state = elm_obj_check_state_get(obj); + Eina_Bool state = efl_ui_check_selected_get(obj); if (state) _start_pts = eina_list_append(_start_pts, wdg_id); else @@ -256,7 +256,7 @@ _start_pt_content_get(void *data, Evas_Object *obj, const char *part) const Gui_Context *ctx = gui_context_get_by_eid(wdg_id); Eina_Bool state = !!eina_list_data_find(gui_context_start_points_get(ctx), wdg_id); if (strcmp(part, "elm.swallow.icon")) return NULL; - Eo *ck = eo_add(ELM_CHECK_CLASS, obj, eo_event_callback_add(eo_self, ELM_CHECK_EVENT_CHANGED, _start_pt_chk_chg, wdg_id), elm_obj_check_state_set(eo_self, state)); + Eo *ck = eo_add(ELM_CHECK_CLASS, obj, eo_event_callback_add(eo_self, ELM_CHECK_EVENT_CHANGED, _start_pt_chk_chg, wdg_id), efl_ui_check_selected_set(eo_self, state)); return ck; } diff --git a/src/bin/gui/simple_propview.c b/src/bin/gui/simple_propview.c index c9e7d07..89e40ed 100644 --- a/src/bin/gui/simple_propview.c +++ b/src/bin/gui/simple_propview.c @@ -57,9 +57,9 @@ _hover_selected_cb(void *data EINA_UNUSED, const Eo_Event *event) static Eina_Bool _slider_drag_stop_cb(void *data EINA_UNUSED, const Eo_Event *event) { - double num = elm_obj_slider_value_get(event->obj); + double num = efl_ui_progress_value_get(event->obj); num = (round(num * 10))/10; - elm_obj_slider_value_set(event->obj, num); + efl_ui_progress_value_set(event->obj, num); Eo_Event *tmp_event = calloc(1, sizeof(Eo_Event)); tmp_event->obj = event->obj; @@ -267,10 +267,10 @@ _simple_property_handler_get(Eo *box, It_Data *it_data, const char *name) evas_obj_size_hint_align_set(sldr, EVAS_HINT_FILL, -1); elm_obj_slider_indicator_show_set(sldr, EINA_TRUE); elm_obj_slider_indicator_format_set(sldr, "%1.1f"); - elm_obj_slider_unit_format_set(sldr, "%1.1f"); + efl_ui_progress_unit_format_set(sldr, "%1.1f"); elm_obj_slider_min_max_set(sldr, sd->min, sd->max); elm_obj_slider_step_set(sldr, sd->step); - elm_obj_slider_value_set(sldr, val); + efl_ui_progress_value_set(sldr, val); eo_event_callback_add(sldr, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, _slider_drag_stop_cb, NULL); elm_box_pack_end(box, sldr); --
