summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/config/egui_all.eo2
-rw-r--r--data/config/simple_op_db.txt24
-rw-r--r--data/layouts/factory.json2
-rw-r--r--src/bin/gui/cbview.c2
-rw-r--r--src/bin/gui/descview.c2
-rw-r--r--src/bin/gui/editor.c9
-rw-r--r--src/bin/gui/prop_layout.c2
-rw-r--r--src/bin/gui/props_helper.c2
-rw-r--r--src/bin/gui/rmview.c1
-rw-r--r--src/bin/gui/settings_view.c4
-rw-r--r--src/bin/gui/simple_propview.c8
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 @@
1class 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.Naviframe, Elm.Slider, Elm.Progressbar, Elm.Conformant, Efl.Canvas.Proxy) 1class 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.Naviframe, Elm.Slider, Elm.Progressbar, Elm.Conformant, Efl.Canvas.Proxy, Efl.Ui.Progress, Efl.Orientation)
2{ 2{
3} 3}
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 {
49 Elm.Button.autorepeat_gap_timeout; 49 Elm.Button.autorepeat_gap_timeout;
50} 50}
51 51
52Component_Specific_Properties.UI_Component_Specification.Horizontal { 52UI_Component_Specification.Horizontal {
53 Elm.Box.horizontal; 53 Elm.Box.horizontal;
54 Elm.Toolbar.horizontal; 54 Elm.Toolbar.horizontal;
55 Elm.Slider.horizontal;
56 Elm.Panes.horizontal; 55 Elm.Panes.horizontal;
57 Elm.Progressbar.horizontal;
58 Elm.Hoversel.horizontal; 56 Elm.Hoversel.horizontal;
59 Elm.Separator.horizontal; 57 Elm.Separator.horizontal;
60} 58}
@@ -89,19 +87,10 @@ Component_Specific_Properties.Padding {
89Component_Specific_Properties.Image_Path { 87Component_Specific_Properties.Image_Path {
90 Efl.File.file(%0, NULL) for Elm.Image, Elm.Icon, Elm.Entry, Elm.Bg; 88 Efl.File.file(%0, NULL) for Elm.Image, Elm.Icon, Elm.Entry, Elm.Bg;
91} 89}
92Component_Specific_Properties.No_Scale {
93 none Elm.Icon;
94 Elm.Image.no_scale;
95}
96 90
97Component_Specific_Properties.Resizable { 91UI_Component_Specification.Orientation {
98 none Elm.Icon; 92 none Elm.Icon;
99 Elm.Image.resizable; 93 Efl.Orientation.orientation;
100}
101
102Component_Specific_Properties.Orientation {
103 none Elm.Icon;
104 Efl.Image.orientation;
105} 94}
106 95
107Component_Specific_Properties.Aspect_Fixed { 96Component_Specific_Properties.Aspect_Fixed {
@@ -191,8 +180,7 @@ Component_Specific_Properties.Min_Max {
191} 180}
192 181
193Component_Specific_Properties.Value { 182Component_Specific_Properties.Value {
194 Elm.Slider.value; 183 Efl.Ui.Progress.progress_value;
195 Elm.Progressbar.value;
196} 184}
197 185
198Component_Specific_Properties.Step { 186Component_Specific_Properties.Step {
@@ -207,10 +195,6 @@ Component_Specific_Properties.Span_Size {
207 Elm.Progressbar.span_size; 195 Elm.Progressbar.span_size;
208} 196}
209 197
210Component_Specific_Properties.Inverted {
211 Elm.Progressbar.inverted;
212}
213
214Component_Specific_Properties.Collapse { 198Component_Specific_Properties.Collapse {
215 Elm.Frame.collapse; 199 Elm.Frame.collapse;
216} 200}
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 @@
317 }, 317 },
318 "Properties": 318 "Properties":
319 { 319 {
320 "Elm.Progressbar.value":[0.35], 320 "Efl.Ui.Progress.progress_value":[0.35],
321 "Evas.Object.size_hint_weight":[1, 1], 321 "Evas.Object.size_hint_weight":[1, 1],
322 "Efl.Gfx.Base.visible":[true], 322 "Efl.Gfx.Base.visible":[true],
323 "Efl.Gfx.Base.size":[165, 30] 323 "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)
351 } 351 }
352 if (kl == ELM_CHECK_CLASS) 352 if (kl == ELM_CHECK_CLASS)
353 { 353 {
354 Eina_Bool state = elm_obj_check_state_get(obj); 354 Eina_Bool state = efl_ui_check_selected_get(obj);
355 gui_value_bool_set(val, state); 355 gui_value_bool_set(val, state);
356 } 356 }
357 if (kl == ELM_HOVERSEL_CLASS) 357 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)
35 Gui_Widget *wdg = data; 35 Gui_Widget *wdg = data;
36 Eo *obj = event->obj; 36 Eo *obj = event->obj;
37 Eina_Bool new_state, old_state; 37 Eina_Bool new_state, old_state;
38 new_state = elm_obj_check_state_get(obj); 38 new_state = efl_ui_check_selected_get(obj);
39 old_state = wdg_public_get(wdg); 39 old_state = wdg_public_get(wdg);
40 wdg_public_set(wdg, new_state); 40 wdg_public_set(wdg, new_state);
41 41
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)
991 { 991 {
992 cur_logo = eo_add(ELM_IMAGE_CLASS, (Eo *) base_obj); 992 cur_logo = eo_add(ELM_IMAGE_CLASS, (Eo *) base_obj);
993 efl_gfx_size_set(cur_logo, sz, sz); 993 efl_gfx_size_set(cur_logo, sz, sz);
994 elm_obj_image_resizable_set(cur_logo, EINA_TRUE, EINA_TRUE);
995 efl_file_set(cur_logo, EGUI_LAYOUT_IMAGES_PATH"/resize_red.png", NULL); 994 efl_file_set(cur_logo, EGUI_LAYOUT_IMAGES_PATH"/resize_red.png", NULL);
996 eo_key_data_set((Eo *) base_obj, "cursor", cur_logo); 995 eo_key_data_set((Eo *) base_obj, "cursor", cur_logo);
997 996
@@ -3520,12 +3519,12 @@ _prop_update_from_propview_int(void *data EINA_UNUSED, Eo *obj, const Eo_Event_D
3520 if (kl == ELM_CHECK_CLASS) 3519 if (kl == ELM_CHECK_CLASS)
3521 { 3520 {
3522 Eina_Bool state; 3521 Eina_Bool state;
3523 state = elm_obj_check_state_get(obj); 3522 state = efl_ui_check_selected_get(obj);
3524 gui_value_bool_set(val, state); 3523 gui_value_bool_set(val, state);
3525 } 3524 }
3526 if (kl == ELM_SLIDER_CLASS) 3525 if (kl == ELM_SLIDER_CLASS)
3527 { 3526 {
3528 double num = elm_obj_slider_value_get(obj); 3527 double num = efl_ui_progress_value_get(obj);
3529 Param_Default_Value *def_val = NULL; 3528 Param_Default_Value *def_val = NULL;
3530 def_val = eo_key_data_get(obj, _DEFAULT_VALUE); 3529 def_val = eo_key_data_get(obj, _DEFAULT_VALUE);
3531 if (def_val) 3530 if (def_val)
@@ -3705,7 +3704,7 @@ _default_hover_selected_cb(void *data, const Eo_Event *event)
3705 } 3704 }
3706 else if (eo_class_get(handler) == ELM_SLIDER_CLASS) 3705 else if (eo_class_get(handler) == ELM_SLIDER_CLASS)
3707 { 3706 {
3708 elm_obj_slider_value_set(handler, atof(param_default_value_get(def_val))); 3707 efl_ui_progress_value_set(handler, atof(param_default_value_get(def_val)));
3709 eo_key_data_set(handler, _DEFAULT_VALUE, def_val); 3708 eo_key_data_set(handler, _DEFAULT_VALUE, def_val);
3710 } 3709 }
3711 break; 3710 break;
@@ -3783,7 +3782,7 @@ _item_public_update_cb(void *data, const Eo_Event *event)
3783 Gui_Widget *wdg = (Gui_Widget *) _editor_wdg_selected_get(); 3782 Gui_Widget *wdg = (Gui_Widget *) _editor_wdg_selected_get();
3784 3783
3785 Item_Container_Item *item = data, *new_item; 3784 Item_Container_Item *item = data, *new_item;
3786 state = elm_obj_check_state_get(event->obj); 3785 state = efl_ui_check_selected_get(event->obj);
3787 new_item = item_container_item_copy(item); 3786 new_item = item_container_item_copy(item);
3788 item_container_item_public_set(new_item, state); 3787 item_container_item_public_set(new_item, state);
3789 3788
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
70_expert_simple_mode_toggle_changed(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 70_expert_simple_mode_toggle_changed(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
71{ 71{
72 Eo *obj = event->obj; 72 Eo *obj = event->obj;
73 Eina_Bool state = elm_obj_check_state_get(obj); 73 Eina_Bool state = efl_ui_check_selected_get(obj);
74 Egui_Layout_Widgets *g = egui_layout_gui_get(); 74 Egui_Layout_Widgets *g = egui_layout_gui_get();
75 const Gui_Context *ctx = _active_context_get(); 75 const Gui_Context *ctx = _active_context_get();
76 if (!ctx) return EINA_TRUE; 76 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)
290{ 290{
291 Eo *ck = eo_add(ELM_CHECK_CLASS, box); 291 Eo *ck = eo_add(ELM_CHECK_CLASS, box);
292 efl_gfx_visible_set(ck, EINA_TRUE); 292 efl_gfx_visible_set(ck, EINA_TRUE);
293 elm_obj_check_state_set(ck, state); 293 efl_ui_check_selected_set(ck, state);
294 294
295 elm_obj_box_pack_end(box, ck); 295 elm_obj_box_pack_end(box, ck);
296 return ck; 296 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)
607 Eo *icon = elm_image_add(g_rm_win->rm_table); 607 Eo *icon = elm_image_add(g_rm_win->rm_table);
608 efl_file_set(icon, EGUI_LAYOUT_IMAGES_PATH"/enventor_icon.png", NULL); 608 efl_file_set(icon, EGUI_LAYOUT_IMAGES_PATH"/enventor_icon.png", NULL);
609 evas_obj_size_hint_min_set(icon, 25, 25); 609 evas_obj_size_hint_min_set(icon, 25, 25);
610 elm_obj_image_resizable_set(icon, EINA_TRUE, EINA_TRUE);
611 efl_gfx_visible_set(icon, EINA_TRUE); 610 efl_gfx_visible_set(icon, EINA_TRUE);
612 bt = _rmview_button_add(g_rm_win->rm_table, ""); 611 bt = _rmview_button_add(g_rm_win->rm_table, "");
613 elm_obj_container_content_set(bt, "icon", icon); 612 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)
226{ 226{
227 Eid *wdg_id = data; 227 Eid *wdg_id = data;
228 Eo *obj = event->obj; 228 Eo *obj = event->obj;
229 Eina_Bool state = elm_obj_check_state_get(obj); 229 Eina_Bool state = efl_ui_check_selected_get(obj);
230 if (state) 230 if (state)
231 _start_pts = eina_list_append(_start_pts, wdg_id); 231 _start_pts = eina_list_append(_start_pts, wdg_id);
232 else 232 else
@@ -256,7 +256,7 @@ _start_pt_content_get(void *data, Evas_Object *obj, const char *part)
256 const Gui_Context *ctx = gui_context_get_by_eid(wdg_id); 256 const Gui_Context *ctx = gui_context_get_by_eid(wdg_id);
257 Eina_Bool state = !!eina_list_data_find(gui_context_start_points_get(ctx), wdg_id); 257 Eina_Bool state = !!eina_list_data_find(gui_context_start_points_get(ctx), wdg_id);
258 if (strcmp(part, "elm.swallow.icon")) return NULL; 258 if (strcmp(part, "elm.swallow.icon")) return NULL;
259 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)); 259 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));
260 return ck; 260 return ck;
261} 261}
262 262
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)
57static Eina_Bool 57static Eina_Bool
58_slider_drag_stop_cb(void *data EINA_UNUSED, const Eo_Event *event) 58_slider_drag_stop_cb(void *data EINA_UNUSED, const Eo_Event *event)
59{ 59{
60 double num = elm_obj_slider_value_get(event->obj); 60 double num = efl_ui_progress_value_get(event->obj);
61 num = (round(num * 10))/10; 61 num = (round(num * 10))/10;
62 elm_obj_slider_value_set(event->obj, num); 62 efl_ui_progress_value_set(event->obj, num);
63 63
64 Eo_Event *tmp_event = calloc(1, sizeof(Eo_Event)); 64 Eo_Event *tmp_event = calloc(1, sizeof(Eo_Event));
65 tmp_event->obj = event->obj; 65 tmp_event->obj = event->obj;
@@ -267,10 +267,10 @@ _simple_property_handler_get(Eo *box, It_Data *it_data, const char *name)
267 evas_obj_size_hint_align_set(sldr, EVAS_HINT_FILL, -1); 267 evas_obj_size_hint_align_set(sldr, EVAS_HINT_FILL, -1);
268 elm_obj_slider_indicator_show_set(sldr, EINA_TRUE); 268 elm_obj_slider_indicator_show_set(sldr, EINA_TRUE);
269 elm_obj_slider_indicator_format_set(sldr, "%1.1f"); 269 elm_obj_slider_indicator_format_set(sldr, "%1.1f");
270 elm_obj_slider_unit_format_set(sldr, "%1.1f"); 270 efl_ui_progress_unit_format_set(sldr, "%1.1f");
271 elm_obj_slider_min_max_set(sldr, sd->min, sd->max); 271 elm_obj_slider_min_max_set(sldr, sd->min, sd->max);
272 elm_obj_slider_step_set(sldr, sd->step); 272 elm_obj_slider_step_set(sldr, sd->step);
273 elm_obj_slider_value_set(sldr, val); 273 efl_ui_progress_value_set(sldr, val);
274 274
275 eo_event_callback_add(sldr, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, _slider_drag_stop_cb, NULL); 275 eo_event_callback_add(sldr, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, _slider_drag_stop_cb, NULL);
276 elm_box_pack_end(box, sldr); 276 elm_box_pack_end(box, sldr);