diff options
Diffstat (limited to '')
-rw-r--r-- | src/extantz/ephysics_demo.c | 12 | ||||
-rw-r--r-- | src/extantz/extantz.c | 10 | ||||
-rw-r--r-- | src/extantz/files.c | 14 | ||||
-rw-r--r-- | src/extantz/scenri.c | 4 | ||||
-rw-r--r-- | src/extantz/woMan.c | 2 |
5 files changed, 21 insertions, 21 deletions
diff --git a/src/extantz/ephysics_demo.c b/src/extantz/ephysics_demo.c index a7d7c7b..2ff589b 100644 --- a/src/extantz/ephysics_demo.c +++ b/src/extantz/ephysics_demo.c | |||
@@ -34,9 +34,9 @@ EPhysics_World *ephysicsAdd(globals *ourGlobals) | |||
34 | sprintf(buf, "%s/%s.edj", prefix_data_get(), EPHYSICS_TEST_THEME); | 34 | sprintf(buf, "%s/%s.edj", prefix_data_get(), EPHYSICS_TEST_THEME); |
35 | box1 = eo_add(ELM_IMAGE_CLASS, ourGlobals->win, | 35 | box1 = eo_add(ELM_IMAGE_CLASS, ourGlobals->win, |
36 | efl_file_set(buf, "blue-cube"), | 36 | efl_file_set(buf, "blue-cube"), |
37 | evas_obj_size_set(70, 70), | 37 | efl_gfx_size_set(70, 70), |
38 | evas_obj_position_set(ourGlobals->win_w / 2 - 80, ourGlobals->win_h - 200), | 38 | efl_gfx_position_set(ourGlobals->win_w / 2 - 80, ourGlobals->win_h - 200), |
39 | evas_obj_visibility_set(EINA_TRUE) | 39 | efl_gfx_visible_set(EINA_TRUE) |
40 | ); | 40 | ); |
41 | 41 | ||
42 | box_body1 = ephysics_body_box_add(world); | 42 | box_body1 = ephysics_body_box_add(world); |
@@ -51,9 +51,9 @@ EPhysics_World *ephysicsAdd(globals *ourGlobals) | |||
51 | sprintf(buf, "%s/%s.edj", prefix_data_get(), EPHYSICS_TEST_THEME); | 51 | sprintf(buf, "%s/%s.edj", prefix_data_get(), EPHYSICS_TEST_THEME); |
52 | box2 = eo_add(ELM_IMAGE_CLASS, ourGlobals->win, | 52 | box2 = eo_add(ELM_IMAGE_CLASS, ourGlobals->win, |
53 | efl_file_set(buf, "purple-cube"), | 53 | efl_file_set(buf, "purple-cube"), |
54 | evas_obj_size_set(70, 70), | 54 | efl_gfx_size_set(70, 70), |
55 | evas_obj_position_set(ourGlobals->win_w / 2 + 10, ourGlobals->win_h - 200), | 55 | efl_gfx_position_set(ourGlobals->win_w / 2 + 10, ourGlobals->win_h - 200), |
56 | evas_obj_visibility_set(EINA_TRUE) | 56 | efl_gfx_visible_set(EINA_TRUE) |
57 | ); | 57 | ); |
58 | 58 | ||
59 | box_body2 = ephysics_body_box_add(world); | 59 | box_body2 = ephysics_body_box_add(world); |
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index b96346a..6b18eaf 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -267,10 +267,10 @@ static void _on_resize(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA | |||
267 | GLData *gld = &ourGlobals->gld; | 267 | GLData *gld = &ourGlobals->gld; |
268 | Evas_Coord h; | 268 | Evas_Coord h; |
269 | 269 | ||
270 | eo_do(ourGlobals->win, evas_obj_size_get(&ourGlobals->win_w, &ourGlobals->win_h)); | 270 | eo_do(ourGlobals->win, efl_gfx_size_get(&ourGlobals->win_w, &ourGlobals->win_h)); |
271 | eo_do(ourGlobals->tb, | 271 | eo_do(ourGlobals->tb, |
272 | evas_obj_size_hint_min_get(NULL, &h), | 272 | evas_obj_size_hint_min_get(NULL, &h), |
273 | evas_obj_size_set(ourGlobals->win_w, h) | 273 | efl_gfx_size_set(ourGlobals->win_w, h) |
274 | ); | 274 | ); |
275 | // Stop internal windows going under the toolbar. | 275 | // Stop internal windows going under the toolbar. |
276 | evas_object_resize(ourGlobals->mainWindow->layout, ourGlobals->win_w, h); | 276 | evas_object_resize(ourGlobals->mainWindow->layout, ourGlobals->win_w, h); |
@@ -496,7 +496,7 @@ static void makeMainMenu(globals *ourGlobals) | |||
496 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0), | 496 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0), |
497 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), | 497 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), |
498 | elm_obj_toolbar_shrink_mode_set(ELM_TOOLBAR_SHRINK_MENU), | 498 | elm_obj_toolbar_shrink_mode_set(ELM_TOOLBAR_SHRINK_MENU), |
499 | evas_obj_position_set(0, 0), | 499 | efl_gfx_position_set(0, 0), |
500 | elm_obj_toolbar_align_set(0.0) | 500 | elm_obj_toolbar_align_set(0.0) |
501 | ); | 501 | ); |
502 | ourGlobals->tb = tb; | 502 | ourGlobals->tb = tb; |
@@ -684,14 +684,14 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
684 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 684 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
685 | elm_obj_image_fill_outside_set(EINA_TRUE), | 685 | elm_obj_image_fill_outside_set(EINA_TRUE), |
686 | efl_file_set(buf, NULL), | 686 | efl_file_set(buf, NULL), |
687 | evas_obj_visibility_set(EINA_TRUE) | 687 | efl_gfx_visible_set(EINA_TRUE) |
688 | ); | 688 | ); |
689 | elm_win_resize_object_add(ourGlobals.mainWindow->win, ourGlobals.mainWindow->bg); | 689 | elm_win_resize_object_add(ourGlobals.mainWindow->win, ourGlobals.mainWindow->bg); |
690 | #else | 690 | #else |
691 | snprintf(buf, sizeof(buf), "%s/sky_03.jpg", prefix_data_get()); | 691 | snprintf(buf, sizeof(buf), "%s/sky_03.jpg", prefix_data_get()); |
692 | eo_do(ourGlobals.mainWindow->bg, | 692 | eo_do(ourGlobals.mainWindow->bg, |
693 | elm_obj_image_file_set(buf, NULL), | 693 | elm_obj_image_file_set(buf, NULL), |
694 | evas_obj_color_set(255, 255, 255, 255) | 694 | efl_gfx_color_set(255, 255, 255, 255) |
695 | ); | 695 | ); |
696 | #endif | 696 | #endif |
697 | 697 | ||
diff --git a/src/extantz/files.c b/src/extantz/files.c index aee02a0..a6742c2 100644 --- a/src/extantz/files.c +++ b/src/extantz/files.c | |||
@@ -193,7 +193,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
193 | elm_obj_hoversel_item_add("size(desc)", NULL, ELM_ICON_NONE, _sort_selected_cb, (const void *) ELM_FILESELECTOR_SORT_BY_SIZE_DESC), | 193 | elm_obj_hoversel_item_add("size(desc)", NULL, ELM_ICON_NONE, _sort_selected_cb, (const void *) ELM_FILESELECTOR_SORT_BY_SIZE_DESC), |
194 | elm_obj_hoversel_item_add("time(asc)", NULL, ELM_ICON_NONE, _sort_selected_cb, (const void *) ELM_FILESELECTOR_SORT_BY_MODIFIED_ASC), | 194 | elm_obj_hoversel_item_add("time(asc)", NULL, ELM_ICON_NONE, _sort_selected_cb, (const void *) ELM_FILESELECTOR_SORT_BY_MODIFIED_ASC), |
195 | elm_obj_hoversel_item_add("time(desc)", NULL, ELM_ICON_NONE, _sort_selected_cb, (const void *) ELM_FILESELECTOR_SORT_BY_MODIFIED_DESC), | 195 | elm_obj_hoversel_item_add("time(desc)", NULL, ELM_ICON_NONE, _sort_selected_cb, (const void *) ELM_FILESELECTOR_SORT_BY_MODIFIED_DESC), |
196 | evas_obj_visibility_set(EINA_TRUE) | 196 | efl_gfx_visible_set(EINA_TRUE) |
197 | ); | 197 | ); |
198 | elm_object_text_set(hoversel, "sorting"); | 198 | elm_object_text_set(hoversel, "sorting"); |
199 | elm_box_pack_end(vbox, hoversel); | 199 | elm_box_pack_end(vbox, hoversel); |
@@ -206,7 +206,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
206 | elm_obj_hoversel_item_add("small", NULL, ELM_ICON_NONE, _small_icon_clicked, fs), | 206 | elm_obj_hoversel_item_add("small", NULL, ELM_ICON_NONE, _small_icon_clicked, fs), |
207 | elm_obj_hoversel_item_add("medium", NULL, ELM_ICON_NONE, _middle_icon_clicked, fs), | 207 | elm_obj_hoversel_item_add("medium", NULL, ELM_ICON_NONE, _middle_icon_clicked, fs), |
208 | elm_obj_hoversel_item_add("big", NULL, ELM_ICON_NONE, _big_icon_clicked, fs), | 208 | elm_obj_hoversel_item_add("big", NULL, ELM_ICON_NONE, _big_icon_clicked, fs), |
209 | evas_obj_visibility_set(EINA_TRUE) | 209 | efl_gfx_visible_set(EINA_TRUE) |
210 | ); | 210 | ); |
211 | elm_object_text_set(hoversel, "size"); | 211 | elm_object_text_set(hoversel, "size"); |
212 | elm_box_pack_end(vbox, hoversel); | 212 | elm_box_pack_end(vbox, hoversel); |
@@ -217,7 +217,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
217 | 217 | ||
218 | bt = eo_add(ELM_CHECK_CLASS, vbox, | 218 | bt = eo_add(ELM_CHECK_CLASS, vbox, |
219 | elm_obj_check_state_set(elm_fileselector_hidden_visible_get(fs)), | 219 | elm_obj_check_state_set(elm_fileselector_hidden_visible_get(fs)), |
220 | evas_obj_visibility_set(EINA_TRUE) | 220 | efl_gfx_visible_set(EINA_TRUE) |
221 | ); | 221 | ); |
222 | elm_object_text_set(bt, "hidden"); | 222 | elm_object_text_set(bt, "hidden"); |
223 | evas_object_smart_callback_add(bt, "changed", _hidden_clicked, fs); | 223 | evas_object_smart_callback_add(bt, "changed", _hidden_clicked, fs); |
@@ -226,7 +226,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
226 | 226 | ||
227 | rdg = rd = eo_add(ELM_RADIO_CLASS, vbox, | 227 | rdg = rd = eo_add(ELM_RADIO_CLASS, vbox, |
228 | elm_obj_radio_state_value_set(ELM_FILESELECTOR_GRID), | 228 | elm_obj_radio_state_value_set(ELM_FILESELECTOR_GRID), |
229 | evas_obj_visibility_set(EINA_TRUE) | 229 | efl_gfx_visible_set(EINA_TRUE) |
230 | ); | 230 | ); |
231 | elm_object_text_set(rd, "grid"); | 231 | elm_object_text_set(rd, "grid"); |
232 | elm_box_pack_end(vbox, rd); | 232 | elm_box_pack_end(vbox, rd); |
@@ -237,7 +237,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
237 | 237 | ||
238 | rd = eo_add(ELM_RADIO_CLASS, vbox, | 238 | rd = eo_add(ELM_RADIO_CLASS, vbox, |
239 | elm_obj_radio_state_value_set(ELM_FILESELECTOR_LIST), | 239 | elm_obj_radio_state_value_set(ELM_FILESELECTOR_LIST), |
240 | evas_obj_visibility_set(EINA_TRUE) | 240 | efl_gfx_visible_set(EINA_TRUE) |
241 | ); | 241 | ); |
242 | elm_radio_group_add(rd, rdg); | 242 | elm_radio_group_add(rd, rdg); |
243 | elm_object_text_set(rd, "list"); | 243 | elm_object_text_set(rd, "list"); |
@@ -248,7 +248,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
248 | //eo_unref(rdg); | 248 | //eo_unref(rdg); |
249 | 249 | ||
250 | bt = eo_add(ELM_BUTTON_CLASS, me->win, | 250 | bt = eo_add(ELM_BUTTON_CLASS, me->win, |
251 | evas_obj_visibility_set(EINA_TRUE) | 251 | efl_gfx_visible_set(EINA_TRUE) |
252 | ); | 252 | ); |
253 | elm_object_text_set(bt, "OK"); | 253 | elm_object_text_set(bt, "OK"); |
254 | evas_object_smart_callback_add(bt, "clicked", _OK_clicked, me); | 254 | evas_object_smart_callback_add(bt, "clicked", _OK_clicked, me); |
@@ -256,7 +256,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
256 | // eo_unref(bt); | 256 | // eo_unref(bt); |
257 | 257 | ||
258 | bt = eo_add(ELM_BUTTON_CLASS, me->win, | 258 | bt = eo_add(ELM_BUTTON_CLASS, me->win, |
259 | evas_obj_visibility_set(EINA_TRUE) | 259 | efl_gfx_visible_set(EINA_TRUE) |
260 | ); | 260 | ); |
261 | elm_object_text_set(bt, "CANCEL"); | 261 | elm_object_text_set(bt, "CANCEL"); |
262 | evas_object_smart_callback_add(bt, "clicked", _CANCEL_clicked, me); | 262 | evas_object_smart_callback_add(bt, "clicked", _CANCEL_clicked, me); |
diff --git a/src/extantz/scenri.c b/src/extantz/scenri.c index 1e7831d..0b72b20 100644 --- a/src/extantz/scenri.c +++ b/src/extantz/scenri.c | |||
@@ -355,7 +355,7 @@ Scene_Data *scenriAdd(Evas_Object *win) | |||
355 | int w, h; | 355 | int w, h; |
356 | 356 | ||
357 | evas = evas_object_evas_get(win); | 357 | evas = evas_object_evas_get(win); |
358 | eo_do(win, evas_obj_size_get(&w, &h)); | 358 | eo_do(win, efl_gfx_size_get(&w, &h)); |
359 | scene = calloc(1, sizeof(Scene_Data)); | 359 | scene = calloc(1, sizeof(Scene_Data)); |
360 | scene->evas = evas; | 360 | scene->evas = evas; |
361 | eina_clist_init(&(scene->stuffs)); | 361 | eina_clist_init(&(scene->stuffs)); |
@@ -376,7 +376,7 @@ Scene_Data *scenriAdd(Evas_Object *win) | |||
376 | scene->image = eo_add(ELM_IMAGE_CLASS, win, | 376 | scene->image = eo_add(ELM_IMAGE_CLASS, win, |
377 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 377 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
378 | elm_obj_image_fill_outside_set(EINA_TRUE), | 378 | elm_obj_image_fill_outside_set(EINA_TRUE), |
379 | evas_obj_visibility_set(EINA_TRUE), | 379 | efl_gfx_visible_set(EINA_TRUE), |
380 | temp = elm_obj_image_object_get() | 380 | temp = elm_obj_image_object_get() |
381 | ); | 381 | ); |
382 | elm_object_tooltip_text_set(scene->image, ""); | 382 | elm_object_tooltip_text_set(scene->image, ""); |
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c index 2f6e9a5..42b31fc 100644 --- a/src/extantz/woMan.c +++ b/src/extantz/woMan.c | |||
@@ -275,7 +275,7 @@ winFang *woMan_add(globals *ourGlobals) | |||
275 | // evas_obj_text_set("Login"), | 275 | // evas_obj_text_set("Login"), |
276 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), | 276 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), |
277 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0), | 277 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0), |
278 | evas_obj_visibility_set(EINA_TRUE) | 278 | efl_gfx_visible_set(EINA_TRUE) |
279 | ); | 279 | ); |
280 | elm_object_text_set(bt, "Login"); // No eo interface for this that I can find. | 280 | elm_object_text_set(bt, "Login"); // No eo interface for this that I can find. |
281 | // evas_object_smart_callback_add(bt, "clicked", NULL, NULL); | 281 | // evas_object_smart_callback_add(bt, "clicked", NULL, NULL); |