summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2017-05-29 12:00:41 +0900
committerAmitesh Singh <amitesh.sh@samsung.com>2017-05-29 14:52:36 +0900
commit6fe568d9acabb25161e6ebadddc2ec646c012812 (patch)
tree948532163bf446e789ca6a76c4d0285006c197e6
parent5971277e7149fb4330e8cd5e26fa6baa78613c07 (diff)
elm: rename elm_photocam to Efl.Ui.Image.Zoomable
Signed-off-by: Amitesh Singh <amitesh.sh@samsung.com>
-rw-r--r--po/POTFILES.in2
-rw-r--r--src/Makefile_Elementary.am10
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c (renamed from src/lib/elementary/elm_photocam.c)256
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.eo (renamed from src/lib/elementary/elm_photocam.eo)14
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable_eo.h2
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable_pan.eo (renamed from src/lib/elementary/elm_photocam_pan.eo)6
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable_private.h (renamed from src/lib/elementary/elm_widget_photocam.h)32
-rw-r--r--src/lib/elementary/elm_photocam.h2
-rw-r--r--src/lib/elementary/elm_photocam_eo.h2
-rw-r--r--src/lib/elementary/elm_photocam_legacy.h2
10 files changed, 164 insertions, 164 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d57709855b..43f559739a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -146,7 +146,7 @@ src/lib/elementary/elm_notify.c
146src/lib/elementary/elm_panel.c 146src/lib/elementary/elm_panel.c
147src/lib/elementary/elm_panes.c 147src/lib/elementary/elm_panes.c
148src/lib/elementary/elm_photo.c 148src/lib/elementary/elm_photo.c
149src/lib/elementary/elm_photocam.c 149src/lib/elementary/efl_ui_image_zoomable.c
150src/lib/elementary/elm_plug.c 150src/lib/elementary/elm_plug.c
151src/lib/elementary/elm_prefs.c 151src/lib/elementary/elm_prefs.c
152src/lib/elementary/elm_prefs_data.c 152src/lib/elementary/elm_prefs_data.c
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index e83ea8857c..234a02cb08 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -52,8 +52,8 @@ elm_public_eolian_files = \
52 lib/elementary/elm_pan.eo \ 52 lib/elementary/elm_pan.eo \
53 lib/elementary/elm_panel.eo \ 53 lib/elementary/elm_panel.eo \
54 lib/elementary/elm_panes.eo \ 54 lib/elementary/elm_panes.eo \
55 lib/elementary/elm_photocam.eo \ 55 lib/elementary/efl_ui_image_zoomable.eo \
56 lib/elementary/elm_photocam_pan.eo \ 56 lib/elementary/efl_ui_image_zoomable_pan.eo \
57 lib/elementary/elm_player.eo \ 57 lib/elementary/elm_player.eo \
58 lib/elementary/elm_plug.eo \ 58 lib/elementary/elm_plug.eo \
59 lib/elementary/elm_popup.eo \ 59 lib/elementary/elm_popup.eo \
@@ -256,7 +256,7 @@ includesunstable_HEADERS = \
256 lib/elementary/elm_widget_panel.h \ 256 lib/elementary/elm_widget_panel.h \
257 lib/elementary/elm_widget_panes.h \ 257 lib/elementary/elm_widget_panes.h \
258 lib/elementary/elm_widget_photo.h \ 258 lib/elementary/elm_widget_photo.h \
259 lib/elementary/elm_widget_photocam.h \ 259 lib/elementary/efl_ui_image_zoomable_private.h \
260 lib/elementary/elm_widget_player.h \ 260 lib/elementary/elm_widget_player.h \
261 lib/elementary/elm_widget_plug.h \ 261 lib/elementary/elm_widget_plug.h \
262 lib/elementary/elm_widget_popup.h \ 262 lib/elementary/elm_widget_popup.h \
@@ -457,7 +457,7 @@ includesub_HEADERS = \
457 lib/elementary/elm_photo.h \ 457 lib/elementary/elm_photo.h \
458 lib/elementary/elm_photo_legacy.h \ 458 lib/elementary/elm_photo_legacy.h \
459 lib/elementary/elm_photocam.h \ 459 lib/elementary/elm_photocam.h \
460 lib/elementary/elm_photocam_eo.h \ 460 lib/elementary/efl_ui_image_zoomable_eo.h \
461 lib/elementary/elm_photocam_legacy.h \ 461 lib/elementary/elm_photocam_legacy.h \
462 lib/elementary/elm_plug.h \ 462 lib/elementary/elm_plug.h \
463 lib/elementary/elm_plug_eo.h \ 463 lib/elementary/elm_plug_eo.h \
@@ -624,7 +624,7 @@ lib_elementary_libelementary_la_SOURCES = \
624 lib/elementary/elm_panel.c \ 624 lib/elementary/elm_panel.c \
625 lib/elementary/elm_panes.c \ 625 lib/elementary/elm_panes.c \
626 lib/elementary/elm_photo.c \ 626 lib/elementary/elm_photo.c \
627 lib/elementary/elm_photocam.c \ 627 lib/elementary/efl_ui_image_zoomable.c \
628 lib/elementary/elm_plug.c \ 628 lib/elementary/elm_plug.c \
629 lib/elementary/elm_prefs.c \ 629 lib/elementary/elm_prefs.c \
630 lib/elementary/elm_prefs_data.c \ 630 lib/elementary/elm_prefs_data.c \
diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 40ac8e6bdd..8a93f6521f 100644
--- a/src/lib/elementary/elm_photocam.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -8,17 +8,17 @@
8#include <Elementary.h> 8#include <Elementary.h>
9 9
10#include "elm_priv.h" 10#include "elm_priv.h"
11#include "elm_widget_photocam.h" 11#include "efl_ui_image_zoomable_private.h"
12#include "elm_interface_scrollable.h" 12#include "elm_interface_scrollable.h"
13 13
14#define MY_PAN_CLASS ELM_PHOTOCAM_PAN_CLASS 14#define MY_PAN_CLASS EFL_UI_IMAGE_ZOOMABLE_PAN_CLASS
15 15
16#define MY_PAN_CLASS_NAME "Elm_Photocam_Pan" 16#define MY_PAN_CLASS_NAME "Efl.Ui.Image.Zoomable.Pan"
17#define MY_PAN_CLASS_NAME_LEGACY "elm_photocam_pan" 17#define MY_PAN_CLASS_NAME_LEGACY "elm_photocam_pan"
18 18
19#define MY_CLASS ELM_PHOTOCAM_CLASS 19#define MY_CLASS EFL_UI_IMAGE_ZOOMABLE_CLASS
20 20
21#define MY_CLASS_NAME "Elm_Photocam" 21#define MY_CLASS_NAME "Efl.Ui.Image.Zoomable"
22#define MY_CLASS_NAME_LEGACY "elm_photocam" 22#define MY_CLASS_NAME_LEGACY "elm_photocam"
23 23
24/* 24/*
@@ -85,7 +85,7 @@ static Eina_Error PHOTO_FILE_LOAD_ERROR_UNKNOWN_FORMAT;
85 85
86static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); 86static Eina_Bool _key_action_move(Evas_Object *obj, const char *params);
87static Eina_Bool _key_action_zoom(Evas_Object *obj, const char *params); 87static Eina_Bool _key_action_zoom(Evas_Object *obj, const char *params);
88static void _elm_photocam_remote_copier_cancel(Eo *obj, Elm_Photocam_Data *sd); 88static void _efl_ui_image_zoomable_remote_copier_cancel(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd);
89 89
90static const Elm_Action key_actions[] = { 90static const Elm_Action key_actions[] = {
91 {"move", _key_action_move}, 91 {"move", _key_action_move},
@@ -94,7 +94,7 @@ static const Elm_Action key_actions[] = {
94}; 94};
95 95
96static inline void 96static inline void
97_photocam_image_file_set(Evas_Object *obj, Elm_Photocam_Data *sd) 97_photocam_image_file_set(Evas_Object *obj, Efl_Ui_Image_Zoomable_Data *sd)
98{ 98{
99 if (sd->f) 99 if (sd->f)
100 evas_object_image_mmap_set(obj, sd->f, NULL); 100 evas_object_image_mmap_set(obj, sd->f, NULL);
@@ -146,7 +146,7 @@ _calc_job_cb(void *data)
146} 146}
147 147
148EOLIAN static void 148EOLIAN static void
149_elm_photocam_pan_efl_gfx_position_set(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas_Coord x, Evas_Coord y) 149_efl_ui_image_zoomable_pan_efl_gfx_position_set(Eo *obj, Efl_Ui_Image_Zoomable_Pan_Data *psd, Evas_Coord x, Evas_Coord y)
150{ 150{
151 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, x, y)) 151 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, x, y))
152 return; 152 return;
@@ -158,7 +158,7 @@ _elm_photocam_pan_efl_gfx_position_set(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas
158} 158}
159 159
160EOLIAN static void 160EOLIAN static void
161_elm_photocam_pan_efl_gfx_size_set(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas_Coord w, Evas_Coord h) 161_efl_ui_image_zoomable_pan_efl_gfx_size_set(Eo *obj, Efl_Ui_Image_Zoomable_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
162{ 162{
163 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, w, h)) 163 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, w, h))
164 return; 164 return;
@@ -205,7 +205,7 @@ _image_place(Evas_Object *obj,
205 205
206static void 206static void
207_grid_load(Evas_Object *obj, 207_grid_load(Evas_Object *obj,
208 Elm_Phocam_Grid *g) 208 Efl_Ui_Image_Zoomable_Grid *g)
209{ 209{
210 int x, y; 210 int x, y;
211 Evas_Coord ox, oy, ow, oh, cvx, cvy, cvw, cvh, gw, gh, tx, ty; 211 Evas_Coord ox, oy, ow, oh, cvx, cvy, cvw, cvh, gw, gh, tx, ty;
@@ -265,7 +265,7 @@ _grid_load(Evas_Object *obj,
265 (wd->resize_obj, 265 (wd->resize_obj,
266 "elm,state,busy,start", "elm"); 266 "elm,state,busy,start", "elm");
267 efl_event_callback_legacy_call 267 efl_event_callback_legacy_call
268 (obj, ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL); 268 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
269 } 269 }
270 } 270 }
271 else if ((g->grid[tn].want) && (!visible)) 271 else if ((g->grid[tn].want) && (!visible))
@@ -277,7 +277,7 @@ _grid_load(Evas_Object *obj,
277 (wd->resize_obj, 277 (wd->resize_obj,
278 "elm,state,busy,stop", "elm"); 278 "elm,state,busy,stop", "elm");
279 efl_event_callback_legacy_call 279 efl_event_callback_legacy_call
280 (obj, ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL); 280 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
281 } 281 }
282 g->grid[tn].want = 0; 282 g->grid[tn].want = 0;
283 evas_object_hide(g->grid[tn].img); 283 evas_object_hide(g->grid[tn].img);
@@ -297,7 +297,7 @@ _grid_load(Evas_Object *obj,
297 297
298static void 298static void
299_grid_place(Evas_Object *obj, 299_grid_place(Evas_Object *obj,
300 Elm_Phocam_Grid *g, 300 Efl_Ui_Image_Zoomable_Grid *g,
301 Evas_Coord px, 301 Evas_Coord px,
302 Evas_Coord py, 302 Evas_Coord py,
303 Evas_Coord ox, 303 Evas_Coord ox,
@@ -351,9 +351,9 @@ _grid_place(Evas_Object *obj,
351} 351}
352 352
353EOLIAN static void 353EOLIAN static void
354_elm_photocam_pan_efl_canvas_group_group_calculate(Eo *obj, Elm_Photocam_Pan_Data *psd) 354_efl_ui_image_zoomable_pan_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Image_Zoomable_Pan_Data *psd)
355{ 355{
356 Elm_Phocam_Grid *g; 356 Efl_Ui_Image_Zoomable_Grid *g;
357 Eina_List *l; 357 Eina_List *l;
358 Evas_Coord ox, oy, ow, oh; 358 Evas_Coord ox, oy, ow, oh;
359 359
@@ -376,7 +376,7 @@ _elm_photocam_pan_efl_canvas_group_group_calculate(Eo *obj, Elm_Photocam_Pan_Dat
376} 376}
377 377
378EOLIAN static void 378EOLIAN static void
379_elm_photocam_pan_elm_pan_pos_set(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas_Coord x, Evas_Coord y) 379_efl_ui_image_zoomable_pan_elm_pan_pos_set(Eo *obj, Efl_Ui_Image_Zoomable_Pan_Data *psd, Evas_Coord x, Evas_Coord y)
380{ 380{
381 if ((x == psd->wsd->pan_x) && (y == psd->wsd->pan_y)) return; 381 if ((x == psd->wsd->pan_x) && (y == psd->wsd->pan_y)) return;
382 psd->wsd->pan_x = x; 382 psd->wsd->pan_x = x;
@@ -385,14 +385,14 @@ _elm_photocam_pan_elm_pan_pos_set(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas_Coor
385} 385}
386 386
387EOLIAN static void 387EOLIAN static void
388_elm_photocam_pan_elm_pan_pos_get(Eo *obj EINA_UNUSED, Elm_Photocam_Pan_Data *psd, Evas_Coord *x, Evas_Coord *y) 388_efl_ui_image_zoomable_pan_elm_pan_pos_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Pan_Data *psd, Evas_Coord *x, Evas_Coord *y)
389{ 389{
390 if (x) *x = psd->wsd->pan_x; 390 if (x) *x = psd->wsd->pan_x;
391 if (y) *y = psd->wsd->pan_y; 391 if (y) *y = psd->wsd->pan_y;
392} 392}
393 393
394EOLIAN static void 394EOLIAN static void
395_elm_photocam_pan_elm_pan_pos_max_get(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas_Coord *x, Evas_Coord *y) 395_efl_ui_image_zoomable_pan_elm_pan_pos_max_get(Eo *obj, Efl_Ui_Image_Zoomable_Pan_Data *psd, Evas_Coord *x, Evas_Coord *y)
396{ 396{
397 Evas_Coord ow, oh; 397 Evas_Coord ow, oh;
398 398
@@ -406,33 +406,33 @@ _elm_photocam_pan_elm_pan_pos_max_get(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas_
406} 406}
407 407
408EOLIAN static void 408EOLIAN static void
409_elm_photocam_pan_elm_pan_pos_min_get(Eo *obj EINA_UNUSED, Elm_Photocam_Pan_Data *_pd EINA_UNUSED, Evas_Coord *x, Evas_Coord *y) 409_efl_ui_image_zoomable_pan_elm_pan_pos_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Pan_Data *_pd EINA_UNUSED, Evas_Coord *x, Evas_Coord *y)
410{ 410{
411 if (x) *x = 0; 411 if (x) *x = 0;
412 if (y) *y = 0; 412 if (y) *y = 0;
413} 413}
414 414
415EOLIAN static void 415EOLIAN static void
416_elm_photocam_pan_elm_pan_content_size_get(Eo *obj EINA_UNUSED, Elm_Photocam_Pan_Data *psd, Evas_Coord *w, Evas_Coord *h) 416_efl_ui_image_zoomable_pan_elm_pan_content_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Pan_Data *psd, Evas_Coord *w, Evas_Coord *h)
417{ 417{
418 if (w) *w = psd->wsd->minw; 418 if (w) *w = psd->wsd->minw;
419 if (h) *h = psd->wsd->minh; 419 if (h) *h = psd->wsd->minh;
420} 420}
421 421
422EOLIAN static void 422EOLIAN static void
423_elm_photocam_pan_efl_object_destructor(Eo *obj, Elm_Photocam_Pan_Data *psd) 423_efl_ui_image_zoomable_pan_efl_object_destructor(Eo *obj, Efl_Ui_Image_Zoomable_Pan_Data *psd)
424{ 424{
425 efl_data_unref(psd->wobj, psd->wsd); 425 efl_data_unref(psd->wobj, psd->wsd);
426 efl_destructor(efl_super(obj, MY_PAN_CLASS)); 426 efl_destructor(efl_super(obj, MY_PAN_CLASS));
427} 427}
428 428
429EOLIAN static void 429EOLIAN static void
430_elm_photocam_pan_class_constructor(Efl_Class *klass) 430_efl_ui_image_zoomable_pan_class_constructor(Efl_Class *klass)
431{ 431{
432 evas_smart_legacy_type_register(MY_PAN_CLASS_NAME_LEGACY, klass); 432 evas_smart_legacy_type_register(MY_PAN_CLASS_NAME_LEGACY, klass);
433} 433}
434 434
435#include "elm_photocam_pan.eo.c" 435#include "efl_ui_image_zoomable_pan.eo.c"
436 436
437static int 437static int
438_nearest_pow2_get(int num) 438_nearest_pow2_get(int num)
@@ -450,7 +450,7 @@ _nearest_pow2_get(int num)
450 450
451static void 451static void
452_grid_clear(Evas_Object *obj, 452_grid_clear(Evas_Object *obj,
453 Elm_Phocam_Grid *g) 453 Efl_Ui_Image_Zoomable_Grid *g)
454{ 454{
455 int x, y; 455 int x, y;
456 456
@@ -475,7 +475,7 @@ _grid_clear(Evas_Object *obj,
475 (wd->resize_obj, 475 (wd->resize_obj,
476 "elm,state,busy,stop", "elm"); 476 "elm,state,busy,stop", "elm");
477 efl_event_callback_legacy_call 477 efl_event_callback_legacy_call
478 (obj, ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL); 478 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
479 } 479 }
480 } 480 }
481 } 481 }
@@ -492,7 +492,7 @@ _tile_preloaded_cb(void *data,
492 Evas_Object *o EINA_UNUSED, 492 Evas_Object *o EINA_UNUSED,
493 void *event_info EINA_UNUSED) 493 void *event_info EINA_UNUSED)
494{ 494{
495 Elm_Photocam_Grid_Item *git = data; 495 Efl_Ui_Image_Zoomable_Grid_Item *git = data;
496 ELM_PHOTOCAM_DATA_GET(git->obj, sd); 496 ELM_PHOTOCAM_DATA_GET(git->obj, sd);
497 ELM_WIDGET_DATA_GET_OR_RETURN(git->obj, wd); 497 ELM_WIDGET_DATA_GET_OR_RETURN(git->obj, wd);
498 498
@@ -508,7 +508,7 @@ _tile_preloaded_cb(void *data,
508 (wd->resize_obj, "elm,state,busy,stop", 508 (wd->resize_obj, "elm,state,busy,stop",
509 "elm"); 509 "elm");
510 efl_event_callback_legacy_call 510 efl_event_callback_legacy_call
511 (wd->obj, ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL); 511 (wd->obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
512 } 512 }
513 } 513 }
514} 514}
@@ -522,15 +522,15 @@ _grid_zoom_calc(double zoom)
522 return _nearest_pow2_get(z); 522 return _nearest_pow2_get(z);
523} 523}
524 524
525static Elm_Phocam_Grid * 525static Efl_Ui_Image_Zoomable_Grid *
526_grid_create(Evas_Object *obj) 526_grid_create(Evas_Object *obj)
527{ 527{
528 int x, y; 528 int x, y;
529 Elm_Phocam_Grid *g; 529 Efl_Ui_Image_Zoomable_Grid *g;
530 530
531 ELM_PHOTOCAM_DATA_GET(obj, sd); 531 ELM_PHOTOCAM_DATA_GET(obj, sd);
532 532
533 g = calloc(1, sizeof(Elm_Phocam_Grid)); 533 g = calloc(1, sizeof(Efl_Ui_Image_Zoomable_Grid));
534 if (!g) return NULL; 534 if (!g) return NULL;
535 535
536 g->zoom = _grid_zoom_calc(sd->zoom); 536 g->zoom = _grid_zoom_calc(sd->zoom);
@@ -557,7 +557,7 @@ _grid_create(Evas_Object *obj)
557 g->gh = 1; 557 g->gh = 1;
558 } 558 }
559 559
560 g->grid = calloc(1, sizeof(Elm_Photocam_Grid_Item) * g->gw * g->gh); 560 g->grid = calloc(1, sizeof(Efl_Ui_Image_Zoomable_Grid_Item) * g->gw * g->gh);
561 if (!g->grid) 561 if (!g->grid)
562 { 562 {
563 g->gw = 0; 563 g->gw = 0;
@@ -616,7 +616,7 @@ _grid_create(Evas_Object *obj)
616static void 616static void
617_grid_clear_all(Evas_Object *obj) 617_grid_clear_all(Evas_Object *obj)
618{ 618{
619 Elm_Phocam_Grid *g; 619 Efl_Ui_Image_Zoomable_Grid *g;
620 620
621 ELM_PHOTOCAM_DATA_GET(obj, sd); 621 ELM_PHOTOCAM_DATA_GET(obj, sd);
622 622
@@ -630,7 +630,7 @@ _grid_clear_all(Evas_Object *obj)
630static void 630static void
631_smooth_update(Evas_Object *obj) 631_smooth_update(Evas_Object *obj)
632{ 632{
633 Elm_Phocam_Grid *g; 633 Efl_Ui_Image_Zoomable_Grid *g;
634 int x, y; 634 int x, y;
635 Eina_List *l; 635 Eina_List *l;
636 636
@@ -655,7 +655,7 @@ _smooth_update(Evas_Object *obj)
655} 655}
656 656
657static void 657static void
658_grid_raise(Elm_Phocam_Grid *g) 658_grid_raise(Efl_Ui_Image_Zoomable_Grid *g)
659{ 659{
660 int x, y; 660 int x, y;
661 661
@@ -691,7 +691,7 @@ _main_img_preloaded_cb(void *data,
691 void *event_info EINA_UNUSED) 691 void *event_info EINA_UNUSED)
692{ 692{
693 Evas_Object *obj = data; 693 Evas_Object *obj = data;
694 Elm_Phocam_Grid *g; 694 Efl_Ui_Image_Zoomable_Grid *g;
695 695
696 ELM_PHOTOCAM_DATA_GET(data, sd); 696 ELM_PHOTOCAM_DATA_GET(data, sd);
697 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); 697 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
@@ -706,14 +706,14 @@ _main_img_preloaded_cb(void *data,
706 } 706 }
707 ecore_job_del(sd->calc_job); 707 ecore_job_del(sd->calc_job);
708 sd->calc_job = ecore_job_add(_calc_job_cb, data); 708 sd->calc_job = ecore_job_add(_calc_job_cb, data);
709 efl_event_callback_legacy_call(data, ELM_PHOTOCAM_EVENT_LOADED, NULL); 709 efl_event_callback_legacy_call(data, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED, NULL);
710 sd->preload_num--; 710 sd->preload_num--;
711 if (!sd->preload_num) 711 if (!sd->preload_num)
712 { 712 {
713 edje_object_signal_emit 713 edje_object_signal_emit
714 (wd->resize_obj, "elm,state,busy,stop", "elm"); 714 (wd->resize_obj, "elm,state,busy,stop", "elm");
715 efl_event_callback_legacy_call 715 efl_event_callback_legacy_call
716 (obj, ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL); 716 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
717 } 717 }
718} 718}
719 719
@@ -756,7 +756,7 @@ _zoom_do(Evas_Object *obj,
756 if (t >= 1.0) 756 if (t >= 1.0)
757 { 757 {
758 Eina_List *l, *l_next; 758 Eina_List *l, *l_next;
759 Elm_Phocam_Grid *g; 759 Efl_Ui_Image_Zoomable_Grid *g;
760 760
761 EINA_LIST_FOREACH_SAFE(sd->grids, l, l_next, g) 761 EINA_LIST_FOREACH_SAFE(sd->grids, l, l_next, g)
762 { 762 {
@@ -829,7 +829,7 @@ _mouse_down_cb(void *data,
829 efl_event_callback_legacy_call 829 efl_event_callback_legacy_call
830 (data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL); 830 (data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
831 else 831 else
832 efl_event_callback_legacy_call(data, ELM_PHOTOCAM_EVENT_PRESS, NULL); 832 efl_event_callback_legacy_call(data, EFL_UI_IMAGE_ZOOMABLE_EVENT_PRESS, NULL);
833 sd->longpressed = EINA_FALSE; 833 sd->longpressed = EINA_FALSE;
834 ecore_timer_del(sd->long_timer); 834 ecore_timer_del(sd->long_timer);
835 sd->long_timer = ecore_timer_add 835 sd->long_timer = ecore_timer_add
@@ -857,7 +857,7 @@ _mouse_up_cb(void *data,
857} 857}
858 858
859EOLIAN static Eina_Bool 859EOLIAN static Eina_Bool
860_elm_photocam_elm_widget_on_focus(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED) 860_efl_ui_image_zoomable_elm_widget_on_focus(Eo *obj, Efl_Ui_Image_Zoomable_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
861{ 861{
862 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 862 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
863 Eina_Bool int_ret = EINA_FALSE; 863 Eina_Bool int_ret = EINA_FALSE;
@@ -882,7 +882,7 @@ _elm_photocam_elm_widget_on_focus(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED, E
882} 882}
883 883
884EOLIAN static Elm_Theme_Apply 884EOLIAN static Elm_Theme_Apply
885_elm_photocam_elm_widget_theme_apply(Eo *obj, Elm_Photocam_Data *sd EINA_UNUSED) 885_efl_ui_image_zoomable_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd EINA_UNUSED)
886{ 886{
887 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 887 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
888 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 888 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
@@ -1025,7 +1025,7 @@ _key_action_zoom(Evas_Object *obj, const char *params)
1025} 1025}
1026 1026
1027EOLIAN static Eina_Bool 1027EOLIAN static Eina_Bool
1028_elm_photocam_elm_widget_widget_event(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 1028_efl_ui_image_zoomable_elm_widget_widget_event(Eo *obj, Efl_Ui_Image_Zoomable_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
1029{ 1029{
1030 (void) src; 1030 (void) src;
1031 Evas_Event_Key_Down *ev = event_info; 1031 Evas_Event_Key_Down *ev = event_info;
@@ -1089,7 +1089,7 @@ _bounce_eval(void *data, const Efl_Event *event EINA_UNUSED)
1089} 1089}
1090 1090
1091static void 1091static void
1092_elm_photocam_bounce_reset(Eo *obj, Elm_Photocam_Data *sd EINA_UNUSED) 1092_efl_ui_image_zoomable_bounce_reset(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd EINA_UNUSED)
1093{ 1093{
1094 Eina_Bool r; 1094 Eina_Bool r;
1095 1095
@@ -1098,7 +1098,7 @@ _elm_photocam_bounce_reset(Eo *obj, Elm_Photocam_Data *sd EINA_UNUSED)
1098} 1098}
1099 1099
1100static void 1100static void
1101_elm_photocam_zoom_reset(Eo *obj, Elm_Photocam_Data *sd) 1101_efl_ui_image_zoomable_zoom_reset(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd)
1102{ 1102{
1103 Eina_Bool r; 1103 Eina_Bool r;
1104 1104
@@ -1185,7 +1185,7 @@ _g_layer_zoom_start_cb(void *data,
1185 Evas_Coord rw = 0, rh = 0; 1185 Evas_Coord rw = 0, rh = 0;
1186 int x, y, w, h; 1186 int x, y, w, h;
1187 1187
1188 _elm_photocam_bounce_reset(obj, sd); 1188 _efl_ui_image_zoomable_bounce_reset(obj, sd);
1189 sd->zoom_g_layer = EINA_TRUE; 1189 sd->zoom_g_layer = EINA_TRUE;
1190 1190
1191 elm_interface_scrollable_freeze_set(obj, EINA_TRUE); 1191 elm_interface_scrollable_freeze_set(obj, EINA_TRUE);
@@ -1213,7 +1213,7 @@ static Evas_Event_Flags
1213_g_layer_zoom_move_cb(void *data, 1213_g_layer_zoom_move_cb(void *data,
1214 void *event_info) 1214 void *event_info)
1215{ 1215{
1216 Elm_Photocam_Data *sd = efl_data_scope_get(data, MY_CLASS); 1216 Efl_Ui_Image_Zoomable_Data *sd = efl_data_scope_get(data, MY_CLASS);
1217 Elm_Gesture_Zoom_Info *p = event_info; 1217 Elm_Gesture_Zoom_Info *p = event_info;
1218 1218
1219 _g_layer_zoom_do(data, sd->zoom_point_x, sd->zoom_point_y, p); 1219 _g_layer_zoom_do(data, sd->zoom_point_x, sd->zoom_point_y, p);
@@ -1319,7 +1319,7 @@ _g_layer_zoom_end_cb(void *data,
1319} 1319}
1320 1320
1321static void 1321static void
1322_orient_do(Evas_Object *obj, Elm_Photocam_Data *sd) 1322_orient_do(Evas_Object *obj, Efl_Ui_Image_Zoomable_Data *sd)
1323{ 1323{
1324 evas_object_smart_member_del(sd->img); 1324 evas_object_smart_member_del(sd->img);
1325 elm_widget_sub_object_del(obj, sd->img); 1325 elm_widget_sub_object_del(obj, sd->img);
@@ -1330,11 +1330,11 @@ _orient_do(Evas_Object *obj, Elm_Photocam_Data *sd)
1330} 1330}
1331 1331
1332static void 1332static void
1333_orient_apply(Eo *obj, Elm_Photocam_Data *sd) 1333_orient_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd)
1334{ 1334{
1335 int iw, ih; 1335 int iw, ih;
1336 Eina_List *l; 1336 Eina_List *l;
1337 Elm_Phocam_Grid *g, *g_orient = NULL; 1337 Efl_Ui_Image_Zoomable_Grid *g, *g_orient = NULL;
1338 1338
1339 // Note: This is based on legacy code. Separating flip & orient in eo api 1339 // Note: This is based on legacy code. Separating flip & orient in eo api
1340 // means we need to do the apply twice. This could be delayed as a job. 1340 // means we need to do the apply twice. This could be delayed as a job.
@@ -1376,7 +1376,7 @@ _orient_apply(Eo *obj, Elm_Photocam_Data *sd)
1376} 1376}
1377 1377
1378EOLIAN static void 1378EOLIAN static void
1379_elm_photocam_efl_orientation_orientation_set(Eo *obj, Elm_Photocam_Data *sd, 1379_efl_ui_image_zoomable_efl_orientation_orientation_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd,
1380 Efl_Orient orient) 1380 Efl_Orient orient)
1381{ 1381{
1382 if (sd->orient == orient) return; 1382 if (sd->orient == orient) return;
@@ -1386,13 +1386,13 @@ _elm_photocam_efl_orientation_orientation_set(Eo *obj, Elm_Photocam_Data *sd,
1386} 1386}
1387 1387
1388EOLIAN static Efl_Orient 1388EOLIAN static Efl_Orient
1389_elm_photocam_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd) 1389_efl_ui_image_zoomable_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
1390{ 1390{
1391 return sd->orient; 1391 return sd->orient;
1392} 1392}
1393 1393
1394EOLIAN static void 1394EOLIAN static void
1395_elm_photocam_efl_flipable_flip_set(Eo *obj, Elm_Photocam_Data *sd, Efl_Flip flip) 1395_efl_ui_image_zoomable_efl_flipable_flip_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, Efl_Flip flip)
1396{ 1396{
1397 if (sd->flip == flip) return; 1397 if (sd->flip == flip) return;
1398 1398
@@ -1401,16 +1401,16 @@ _elm_photocam_efl_flipable_flip_set(Eo *obj, Elm_Photocam_Data *sd, Efl_Flip fli
1401} 1401}
1402 1402
1403EOLIAN static Efl_Flip 1403EOLIAN static Efl_Flip
1404_elm_photocam_efl_flipable_flip_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd) 1404_efl_ui_image_zoomable_efl_flipable_flip_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
1405{ 1405{
1406 return sd->flip; 1406 return sd->flip;
1407} 1407}
1408 1408
1409EOLIAN static void 1409EOLIAN static void
1410_elm_photocam_efl_canvas_group_group_add(Eo *obj, Elm_Photocam_Data *priv) 1410_efl_ui_image_zoomable_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Zoomable_Data *priv)
1411{ 1411{
1412 Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable; 1412 Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable;
1413 Elm_Photocam_Pan_Data *pan_data; 1413 Efl_Ui_Image_Zoomable_Pan_Data *pan_data;
1414 Evas_Object *edje; 1414 Evas_Object *edje;
1415 Evas_Coord minw, minh; 1415 Evas_Coord minw, minh;
1416 1416
@@ -1483,9 +1483,9 @@ _elm_photocam_efl_canvas_group_group_add(Eo *obj, Elm_Photocam_Data *priv)
1483} 1483}
1484 1484
1485EOLIAN static void 1485EOLIAN static void
1486_elm_photocam_efl_canvas_group_group_del(Eo *obj, Elm_Photocam_Data *sd) 1486_efl_ui_image_zoomable_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd)
1487{ 1487{
1488 Elm_Phocam_Grid *g; 1488 Efl_Ui_Image_Zoomable_Grid *g;
1489 1489
1490 EINA_LIST_FREE(sd->grids, g) 1490 EINA_LIST_FREE(sd->grids, g)
1491 { 1491 {
@@ -1496,7 +1496,7 @@ _elm_photocam_efl_canvas_group_group_del(Eo *obj, Elm_Photocam_Data *sd)
1496 ELM_SAFE_FREE(sd->pan_obj, evas_object_del); 1496 ELM_SAFE_FREE(sd->pan_obj, evas_object_del);
1497 1497
1498 if (sd->f) eina_file_close(sd->f); 1498 if (sd->f) eina_file_close(sd->f);
1499 if (sd->remote.copier) _elm_photocam_remote_copier_cancel(obj, sd); 1499 if (sd->remote.copier) _efl_ui_image_zoomable_remote_copier_cancel(obj, sd);
1500 if (sd->remote.binbuf) ELM_SAFE_FREE(sd->remote.binbuf, eina_binbuf_free); 1500 if (sd->remote.binbuf) ELM_SAFE_FREE(sd->remote.binbuf, eina_binbuf_free);
1501 eina_stringshare_del(sd->file); 1501 eina_stringshare_del(sd->file);
1502 ecore_job_del(sd->calc_job); 1502 ecore_job_del(sd->calc_job);
@@ -1509,7 +1509,7 @@ _elm_photocam_efl_canvas_group_group_del(Eo *obj, Elm_Photocam_Data *sd)
1509} 1509}
1510 1510
1511EOLIAN static void 1511EOLIAN static void
1512_elm_photocam_efl_gfx_position_set(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord x, Evas_Coord y) 1512_efl_ui_image_zoomable_efl_gfx_position_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, Evas_Coord x, Evas_Coord y)
1513{ 1513{
1514 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, x, y)) 1514 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, x, y))
1515 return; 1515 return;
@@ -1520,7 +1520,7 @@ _elm_photocam_efl_gfx_position_set(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord x,
1520} 1520}
1521 1521
1522EOLIAN static void 1522EOLIAN static void
1523_elm_photocam_efl_gfx_size_set(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord w, Evas_Coord h) 1523_efl_ui_image_zoomable_efl_gfx_size_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, Evas_Coord w, Evas_Coord h)
1524{ 1524{
1525 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, w, h)) 1525 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, w, h))
1526 return; 1526 return;
@@ -1531,7 +1531,7 @@ _elm_photocam_efl_gfx_size_set(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord w, Eva
1531} 1531}
1532 1532
1533EOLIAN static void 1533EOLIAN static void
1534_elm_photocam_efl_canvas_group_group_member_add(Eo *obj, Elm_Photocam_Data *sd, Evas_Object *member) 1534_efl_ui_image_zoomable_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, Evas_Object *member)
1535{ 1535{
1536 1536
1537 efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member); 1537 efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member);
@@ -1549,7 +1549,7 @@ elm_photocam_add(Evas_Object *parent)
1549} 1549}
1550 1550
1551EOLIAN static Eo * 1551EOLIAN static Eo *
1552_elm_photocam_efl_object_constructor(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED) 1552_efl_ui_image_zoomable_efl_object_constructor(Eo *obj, Efl_Ui_Image_Zoomable_Data *_pd EINA_UNUSED)
1553{ 1553{
1554 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1554 obj = efl_constructor(efl_super(obj, MY_CLASS));
1555 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1555 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -1560,14 +1560,14 @@ _elm_photocam_efl_object_constructor(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED
1560} 1560}
1561 1561
1562EOLIAN static void 1562EOLIAN static void
1563_elm_photocam_efl_image_image_size_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *pd, int *w, int *h) 1563_efl_ui_image_zoomable_efl_image_image_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *pd, int *w, int *h)
1564{ 1564{
1565 if (w) *w = pd->size.imw; 1565 if (w) *w = pd->size.imw;
1566 if (h) *h = pd->size.imh; 1566 if (h) *h = pd->size.imh;
1567} 1567}
1568 1568
1569static void 1569static void
1570_internal_file_set(Eo *obj, Elm_Photocam_Data *sd, const char *file, Eina_File *f, Evas_Load_Error *ret) 1570_internal_file_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, const char *file, Eina_File *f, Evas_Load_Error *ret)
1571{ 1571{
1572 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1572 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1573 Evas_Load_Error err; 1573 Evas_Load_Error err;
@@ -1613,13 +1613,13 @@ _internal_file_set(Eo *obj, Elm_Photocam_Data *sd, const char *file, Eina_File *
1613 sd->main_load_pending = EINA_TRUE; 1613 sd->main_load_pending = EINA_TRUE;
1614 1614
1615 sd->calc_job = ecore_job_add(_calc_job_cb, obj); 1615 sd->calc_job = ecore_job_add(_calc_job_cb, obj);
1616 efl_event_callback_legacy_call(obj, ELM_PHOTOCAM_EVENT_LOAD, NULL); 1616 efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD, NULL);
1617 sd->preload_num++; 1617 sd->preload_num++;
1618 if (sd->preload_num == 1) 1618 if (sd->preload_num == 1)
1619 { 1619 {
1620 edje_object_signal_emit 1620 edje_object_signal_emit
1621 (wd->resize_obj, "elm,state,busy,start", "elm"); 1621 (wd->resize_obj, "elm,state,busy,start", "elm");
1622 efl_event_callback_legacy_call(obj, ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL); 1622 efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
1623 } 1623 }
1624 1624
1625 tz = sd->zoom; 1625 tz = sd->zoom;
@@ -1633,14 +1633,14 @@ _internal_file_set(Eo *obj, Elm_Photocam_Data *sd, const char *file, Eina_File *
1633} 1633}
1634 1634
1635static void 1635static void
1636_elm_photocam_remote_copier_del(void *data EINA_UNUSED, const Efl_Event *event) 1636_efl_ui_image_zoomable_remote_copier_del(void *data EINA_UNUSED, const Efl_Event *event)
1637{ 1637{
1638 Eo *dialer = efl_io_copier_source_get(event->object); 1638 Eo *dialer = efl_io_copier_source_get(event->object);
1639 efl_del(dialer); 1639 efl_del(dialer);
1640} 1640}
1641 1641
1642static void 1642static void
1643_elm_photocam_remote_copier_cancel(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd) 1643_efl_ui_image_zoomable_remote_copier_cancel(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
1644{ 1644{
1645 Eo *copier = sd->remote.copier; 1645 Eo *copier = sd->remote.copier;
1646 1646
@@ -1649,9 +1649,9 @@ _elm_photocam_remote_copier_cancel(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd)
1649 * efl_del() 1649 * efl_del()
1650 * -> efl_io_closer_close() 1650 * -> efl_io_closer_close()
1651 * -> "done" event 1651 * -> "done" event
1652 * -> _elm_photocam_remote_copier_done() 1652 * -> _efl_ui_image_zoomable_remote_copier_done()
1653 * 1653 *
1654 * flag sd->remote.copier = NULL so _elm_photocam_remote_copier_done() 1654 * flag sd->remote.copier = NULL so _efl_ui_image_zoomable_remote_copier_done()
1655 * knows about it. 1655 * knows about it.
1656 */ 1656 */
1657 sd->remote.copier = NULL; 1657 sd->remote.copier = NULL;
@@ -1659,16 +1659,16 @@ _elm_photocam_remote_copier_cancel(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd)
1659} 1659}
1660 1660
1661static void 1661static void
1662_elm_photocam_remote_copier_done(void *data, const Efl_Event *event EINA_UNUSED) 1662_efl_ui_image_zoomable_remote_copier_done(void *data, const Efl_Event *event EINA_UNUSED)
1663{ 1663{
1664 Eo *obj = data; 1664 Eo *obj = data;
1665 Elm_Photocam_Data *sd = efl_data_scope_get(obj, MY_CLASS); 1665 Efl_Ui_Image_Zoomable_Data *sd = efl_data_scope_get(obj, MY_CLASS);
1666 Eina_File *f; 1666 Eina_File *f;
1667 Eo *dialer; 1667 Eo *dialer;
1668 const char *url; 1668 const char *url;
1669 Evas_Load_Error ret = EVAS_LOAD_ERROR_NONE; 1669 Evas_Load_Error ret = EVAS_LOAD_ERROR_NONE;
1670 1670
1671 /* we're called from _elm_photocam_remote_copier_cancel() */ 1671 /* we're called from _efl_ui_image_zoomable_remote_copier_cancel() */
1672 if (!sd->remote.copier) return; 1672 if (!sd->remote.copier) return;
1673 1673
1674 if (sd->remote.binbuf) eina_binbuf_free(sd->remote.binbuf); 1674 if (sd->remote.binbuf) eina_binbuf_free(sd->remote.binbuf);
@@ -1690,31 +1690,31 @@ _elm_photocam_remote_copier_done(void *data, const Efl_Event *event EINA_UNUSED)
1690 1690
1691 ELM_SAFE_FREE(sd->remote.binbuf, eina_binbuf_free); 1691 ELM_SAFE_FREE(sd->remote.binbuf, eina_binbuf_free);
1692 efl_event_callback_legacy_call 1692 efl_event_callback_legacy_call
1693 (obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_ERROR, &err); 1693 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_DOWNLOAD_ERROR, &err);
1694 } 1694 }
1695 else 1695 else
1696 { 1696 {
1697 efl_event_callback_legacy_call 1697 efl_event_callback_legacy_call
1698 (obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_DONE, NULL); 1698 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_DOWNLOAD_DONE, NULL);
1699 } 1699 }
1700 1700
1701 ELM_SAFE_FREE(sd->remote.copier, efl_del); 1701 ELM_SAFE_FREE(sd->remote.copier, efl_del);
1702} 1702}
1703 1703
1704static void 1704static void
1705_elm_photocam_remote_copier_error(void *data, const Efl_Event *event) 1705_efl_ui_image_zoomable_remote_copier_error(void *data, const Efl_Event *event)
1706{ 1706{
1707 Eo *obj = data; 1707 Eo *obj = data;
1708 Elm_Photocam_Data *sd = efl_data_scope_get(obj, MY_CLASS); 1708 Efl_Ui_Image_Zoomable_Data *sd = efl_data_scope_get(obj, MY_CLASS);
1709 Eina_Error *perr = event->info; 1709 Eina_Error *perr = event->info;
1710 Elm_Photocam_Error err = { *perr, EINA_FALSE }; 1710 Elm_Photocam_Error err = { *perr, EINA_FALSE };
1711 1711
1712 efl_event_callback_legacy_call(obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_ERROR, &err); 1712 efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_DOWNLOAD_ERROR, &err);
1713 _elm_photocam_remote_copier_cancel(obj, sd); 1713 _efl_ui_image_zoomable_remote_copier_cancel(obj, sd);
1714} 1714}
1715 1715
1716static void 1716static void
1717_elm_photocam_remote_copier_progress(void *data, const Efl_Event *event) 1717_efl_ui_image_zoomable_remote_copier_progress(void *data, const Efl_Event *event)
1718{ 1718{
1719 Eo *obj = data; 1719 Eo *obj = data;
1720 Elm_Photocam_Progress progress; 1720 Elm_Photocam_Progress progress;
@@ -1725,17 +1725,17 @@ _elm_photocam_remote_copier_progress(void *data, const Efl_Event *event)
1725 progress.now = now; 1725 progress.now = now;
1726 progress.total = total; 1726 progress.total = total;
1727 efl_event_callback_legacy_call 1727 efl_event_callback_legacy_call
1728 (obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_PROGRESS, &progress); 1728 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_DOWNLOAD_PROGRESS, &progress);
1729} 1729}
1730 1730
1731EFL_CALLBACKS_ARRAY_DEFINE(_elm_photocam_remote_copier_cbs, 1731EFL_CALLBACKS_ARRAY_DEFINE(_efl_ui_image_zoomable_remote_copier_cbs,
1732 { EFL_EVENT_DEL, _elm_photocam_remote_copier_del }, 1732 { EFL_EVENT_DEL, _efl_ui_image_zoomable_remote_copier_del },
1733 { EFL_IO_COPIER_EVENT_DONE, _elm_photocam_remote_copier_done }, 1733 { EFL_IO_COPIER_EVENT_DONE, _efl_ui_image_zoomable_remote_copier_done },
1734 { EFL_IO_COPIER_EVENT_ERROR, _elm_photocam_remote_copier_error }, 1734 { EFL_IO_COPIER_EVENT_ERROR, _efl_ui_image_zoomable_remote_copier_error },
1735 { EFL_IO_COPIER_EVENT_PROGRESS, _elm_photocam_remote_copier_progress }); 1735 { EFL_IO_COPIER_EVENT_PROGRESS, _efl_ui_image_zoomable_remote_copier_progress });
1736 1736
1737static Eina_Bool 1737static Eina_Bool
1738_elm_photocam_download(Eo *obj, Elm_Photocam_Data *sd, const char *url) 1738_efl_ui_image_zoomable_download(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, const char *url)
1739{ 1739{
1740 Eo *dialer; 1740 Eo *dialer;
1741 Elm_Photocam_Error img_err = { ENOSYS, EINA_FALSE }; 1741 Elm_Photocam_Error img_err = { ENOSYS, EINA_FALSE };
@@ -1748,7 +1748,7 @@ _elm_photocam_download(Eo *obj, Elm_Photocam_Data *sd, const char *url)
1748 sd->remote.copier = efl_add(EFL_IO_COPIER_CLASS, obj, 1748 sd->remote.copier = efl_add(EFL_IO_COPIER_CLASS, obj,
1749 efl_io_copier_source_set(efl_added, dialer), 1749 efl_io_copier_source_set(efl_added, dialer),
1750 efl_io_closer_close_on_destructor_set(efl_added, EINA_TRUE), 1750 efl_io_closer_close_on_destructor_set(efl_added, EINA_TRUE),
1751 efl_event_callback_array_add(efl_added, _elm_photocam_remote_copier_cbs(), obj)); 1751 efl_event_callback_array_add(efl_added, _efl_ui_image_zoomable_remote_copier_cbs(), obj));
1752 EINA_SAFETY_ON_NULL_GOTO(sd->remote.copier, error_copier); 1752 EINA_SAFETY_ON_NULL_GOTO(sd->remote.copier, error_copier);
1753 1753
1754 err = efl_net_dialer_dial(dialer, url); 1754 err = efl_net_dialer_dial(dialer, url);
@@ -1763,7 +1763,7 @@ _elm_photocam_download(Eo *obj, Elm_Photocam_Data *sd, const char *url)
1763 1763
1764 error_dial: 1764 error_dial:
1765 evas_object_smart_callback_call(obj, SIG_DOWNLOAD_ERROR, &img_err); 1765 evas_object_smart_callback_call(obj, SIG_DOWNLOAD_ERROR, &img_err);
1766 _elm_photocam_remote_copier_cancel(obj, sd); 1766 _efl_ui_image_zoomable_remote_copier_cancel(obj, sd);
1767 return EINA_FALSE; 1767 return EINA_FALSE;
1768 1768
1769 error_copier: 1769 error_copier:
@@ -1781,7 +1781,7 @@ static const Eina_Slice remote_uri[] = {
1781}; 1781};
1782 1782
1783static inline Eina_Bool 1783static inline Eina_Bool
1784_elm_photocam_is_remote(const char *file) 1784_efl_ui_image_zoomable_is_remote(const char *file)
1785{ 1785{
1786 Eina_Slice s = EINA_SLICE_STR(file); 1786 Eina_Slice s = EINA_SLICE_STR(file);
1787 const Eina_Slice *itr; 1787 const Eina_Slice *itr;
@@ -1794,13 +1794,13 @@ _elm_photocam_is_remote(const char *file)
1794} 1794}
1795 1795
1796static Evas_Load_Error 1796static Evas_Load_Error
1797_elm_photocam_file_set_internal(Eo *obj, Elm_Photocam_Data *sd, const char *file) 1797_efl_ui_image_zoomable_file_set_internal(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, const char *file)
1798{ 1798{
1799 Evas_Load_Error ret = EVAS_LOAD_ERROR_NONE; 1799 Evas_Load_Error ret = EVAS_LOAD_ERROR_NONE;
1800 1800
1801 _grid_clear_all(obj); 1801 _grid_clear_all(obj);
1802 _elm_photocam_zoom_reset(obj, sd); 1802 _efl_ui_image_zoomable_zoom_reset(obj, sd);
1803 _elm_photocam_bounce_reset(obj, sd); 1803 _efl_ui_image_zoomable_bounce_reset(obj, sd);
1804 sd->no_smooth--; 1804 sd->no_smooth--;
1805 if (sd->no_smooth == 0) _smooth_update(obj); 1805 if (sd->no_smooth == 0) _smooth_update(obj);
1806 1806
@@ -1809,17 +1809,17 @@ _elm_photocam_file_set_internal(Eo *obj, Elm_Photocam_Data *sd, const char *file
1809 if (sd->f) eina_file_close(sd->f); 1809 if (sd->f) eina_file_close(sd->f);
1810 sd->f = NULL; 1810 sd->f = NULL;
1811 1811
1812 if (sd->remote.copier) _elm_photocam_remote_copier_cancel(obj, sd); 1812 if (sd->remote.copier) _efl_ui_image_zoomable_remote_copier_cancel(obj, sd);
1813 if (sd->remote.binbuf) ELM_SAFE_FREE(sd->remote.binbuf, eina_binbuf_free); 1813 if (sd->remote.binbuf) ELM_SAFE_FREE(sd->remote.binbuf, eina_binbuf_free);
1814 1814
1815 sd->preload_num = 0; 1815 sd->preload_num = 0;
1816 1816
1817 if (_elm_photocam_is_remote(file)) 1817 if (_efl_ui_image_zoomable_is_remote(file))
1818 { 1818 {
1819 if (_elm_photocam_download(obj, sd, file)) 1819 if (_efl_ui_image_zoomable_download(obj, sd, file))
1820 { 1820 {
1821 efl_event_callback_legacy_call 1821 efl_event_callback_legacy_call
1822 (obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_START, NULL); 1822 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_DOWNLOAD_START, NULL);
1823 return ret; 1823 return ret;
1824 } 1824 }
1825 } 1825 }
@@ -1830,9 +1830,9 @@ _elm_photocam_file_set_internal(Eo *obj, Elm_Photocam_Data *sd, const char *file
1830} 1830}
1831 1831
1832EOLIAN static Eina_Bool 1832EOLIAN static Eina_Bool
1833_elm_photocam_efl_file_file_set(Eo *obj, Elm_Photocam_Data *sd, const char *file, const char *key EINA_UNUSED) 1833_efl_ui_image_zoomable_efl_file_file_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, const char *file, const char *key EINA_UNUSED)
1834{ 1834{
1835 Evas_Load_Error ret = _elm_photocam_file_set_internal(obj, sd, file); 1835 Evas_Load_Error ret = _efl_ui_image_zoomable_file_set_internal(obj, sd, file);
1836 1836
1837 if (ret == EVAS_LOAD_ERROR_NONE) return EINA_TRUE; 1837 if (ret == EVAS_LOAD_ERROR_NONE) return EINA_TRUE;
1838 1838
@@ -1848,7 +1848,7 @@ _elm_photocam_efl_file_file_set(Eo *obj, Elm_Photocam_Data *sd, const char *file
1848} 1848}
1849 1849
1850EAPI Evas_Load_Error 1850EAPI Evas_Load_Error
1851elm_photocam_file_set(Elm_Photocam *obj, const char *file) 1851elm_photocam_file_set(Evas_Object *obj, const char *file)
1852{ 1852{
1853 ELM_PHOTOCAM_CHECK(obj) EVAS_LOAD_ERROR_NONE; 1853 ELM_PHOTOCAM_CHECK(obj) EVAS_LOAD_ERROR_NONE;
1854 EINA_SAFETY_ON_NULL_RETURN_VAL(file, EVAS_LOAD_ERROR_NONE); 1854 EINA_SAFETY_ON_NULL_RETURN_VAL(file, EVAS_LOAD_ERROR_NONE);
@@ -1869,14 +1869,14 @@ elm_photocam_file_set(Elm_Photocam *obj, const char *file)
1869} 1869}
1870 1870
1871EOLIAN static void 1871EOLIAN static void
1872_elm_photocam_efl_file_file_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd, const char **file, const char **key) 1872_efl_ui_image_zoomable_efl_file_file_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd, const char **file, const char **key)
1873{ 1873{
1874 if (file) *file = sd->file; 1874 if (file) *file = sd->file;
1875 if (key) *key = NULL; 1875 if (key) *key = NULL;
1876} 1876}
1877 1877
1878EAPI const char* 1878EAPI const char*
1879elm_photocam_file_get(const Elm_Photocam *obj) 1879elm_photocam_file_get(const Evas_Object *obj)
1880{ 1880{
1881 const char *ret = NULL; 1881 const char *ret = NULL;
1882 efl_file_get(obj, &ret, NULL); 1882 efl_file_get(obj, &ret, NULL);
@@ -1884,11 +1884,11 @@ elm_photocam_file_get(const Elm_Photocam *obj)
1884} 1884}
1885 1885
1886EOLIAN static void 1886EOLIAN static void
1887_elm_photocam_efl_ui_zoom_zoom_set(Eo *obj, Elm_Photocam_Data *sd, double zoom) 1887_efl_ui_image_zoomable_efl_ui_zoom_zoom_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, double zoom)
1888{ 1888{
1889 double z; 1889 double z;
1890 Eina_List *l; 1890 Eina_List *l;
1891 Elm_Phocam_Grid *g, *g_zoom = NULL; 1891 Efl_Ui_Image_Zoomable_Grid *g, *g_zoom = NULL;
1892 Evas_Coord pw, ph, rx, ry, rw, rh; 1892 Evas_Coord pw, ph, rx, ry, rw, rh;
1893 int zoom_changed = 0, started = 0; 1893 int zoom_changed = 0, started = 0;
1894 Eina_Bool an = EINA_FALSE; 1894 Eina_Bool an = EINA_FALSE;
@@ -2092,7 +2092,7 @@ done:
2092 // FIXME: Unhandled. 2092 // FIXME: Unhandled.
2093 if (0) 2093 if (0)
2094 { 2094 {
2095 _elm_photocam_bounce_reset(obj, sd); 2095 _efl_ui_image_zoomable_bounce_reset(obj, sd);
2096 an = 0; 2096 an = 0;
2097 } 2097 }
2098 } 2098 }
@@ -2111,13 +2111,13 @@ done:
2111} 2111}
2112 2112
2113EOLIAN static double 2113EOLIAN static double
2114_elm_photocam_efl_ui_zoom_zoom_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd) 2114_efl_ui_image_zoomable_efl_ui_zoom_zoom_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
2115{ 2115{
2116 return sd->zoom; 2116 return sd->zoom;
2117} 2117}
2118 2118
2119EOLIAN static void 2119EOLIAN static void
2120_elm_photocam_efl_ui_zoom_zoom_mode_set(Eo *obj, Elm_Photocam_Data *sd, Elm_Photocam_Zoom_Mode mode) 2120_efl_ui_image_zoomable_efl_ui_zoom_zoom_mode_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, Elm_Photocam_Zoom_Mode mode)
2121{ 2121{
2122 double tz; 2122 double tz;
2123 if (sd->mode == mode) return; 2123 if (sd->mode == mode) return;
@@ -2129,20 +2129,20 @@ _elm_photocam_efl_ui_zoom_zoom_mode_set(Eo *obj, Elm_Photocam_Data *sd, Elm_Phot
2129} 2129}
2130 2130
2131EOLIAN static Elm_Photocam_Zoom_Mode 2131EOLIAN static Elm_Photocam_Zoom_Mode
2132_elm_photocam_efl_ui_zoom_zoom_mode_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd) 2132_efl_ui_image_zoomable_efl_ui_zoom_zoom_mode_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
2133{ 2133{
2134 return sd->mode; 2134 return sd->mode;
2135} 2135}
2136 2136
2137EOLIAN static void 2137EOLIAN static void
2138_elm_photocam_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *pd, int *w, int *h) 2138_efl_ui_image_zoomable_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *pd, int *w, int *h)
2139{ 2139{
2140 if (w) *w = pd->size.imw; 2140 if (w) *w = pd->size.imw;
2141 if (h) *h = pd->size.imh; 2141 if (h) *h = pd->size.imh;
2142} 2142}
2143 2143
2144EOLIAN static void 2144EOLIAN static void
2145_elm_photocam_image_region_get(Eo *obj, Elm_Photocam_Data *sd, int *x, int *y, int *w, int *h) 2145_efl_ui_image_zoomable_image_region_get(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, int *x, int *y, int *w, int *h)
2146{ 2146{
2147 Evas_Coord sx, sy, sw, sh; 2147 Evas_Coord sx, sy, sw, sh;
2148 2148
@@ -2193,7 +2193,7 @@ _elm_photocam_image_region_get(Eo *obj, Elm_Photocam_Data *sd, int *x, int *y, i
2193} 2193}
2194 2194
2195EOLIAN static void 2195EOLIAN static void
2196_elm_photocam_image_region_set(Eo *obj, Elm_Photocam_Data *sd, int x, int y, int w, int h) 2196_efl_ui_image_zoomable_image_region_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, int x, int y, int w, int h)
2197{ 2197{
2198 int rx, ry, rw, rh; 2198 int rx, ry, rw, rh;
2199 2199
@@ -2207,8 +2207,8 @@ _elm_photocam_image_region_set(Eo *obj, Elm_Photocam_Data *sd, int x, int y, int
2207 if ((rx + rw) > sd->size.w) rx = sd->size.w - rw; 2207 if ((rx + rw) > sd->size.w) rx = sd->size.w - rw;
2208 if ((ry + rh) > sd->size.h) ry = sd->size.h - rh; 2208 if ((ry + rh) > sd->size.h) ry = sd->size.h - rh;
2209 2209
2210 _elm_photocam_bounce_reset(obj, sd); 2210 _efl_ui_image_zoomable_bounce_reset(obj, sd);
2211 _elm_photocam_zoom_reset(obj, sd); 2211 _efl_ui_image_zoomable_zoom_reset(obj, sd);
2212 2212
2213 elm_interface_scrollable_content_region_show(obj, rx, ry, rw, rh); 2213 elm_interface_scrollable_content_region_show(obj, rx, ry, rw, rh);
2214} 2214}
@@ -2216,7 +2216,7 @@ _elm_photocam_image_region_set(Eo *obj, Elm_Photocam_Data *sd, int x, int y, int
2216EAPI void 2216EAPI void
2217elm_photocam_image_region_show(Evas_Object *obj, int x, int y, int w, int h) 2217elm_photocam_image_region_show(Evas_Object *obj, int x, int y, int w, int h)
2218{ 2218{
2219 elm_obj_photocam_image_region_set(obj, x, y, w, h); 2219 efl_ui_image_zoomable_image_region_set(obj, x, y, w, h);
2220} 2220}
2221 2221
2222EAPI void 2222EAPI void
@@ -2231,7 +2231,7 @@ elm_photocam_image_region_bring_in(Evas_Object *obj,
2231} 2231}
2232 2232
2233EOLIAN static void 2233EOLIAN static void
2234_elm_photocam_elm_interface_scrollable_region_bring_in(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) 2234_efl_ui_image_zoomable_elm_interface_scrollable_region_bring_in(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
2235{ 2235{
2236 int rx, ry, rw, rh; 2236 int rx, ry, rw, rh;
2237 2237
@@ -2245,14 +2245,14 @@ _elm_photocam_elm_interface_scrollable_region_bring_in(Eo *obj, Elm_Photocam_Dat
2245 if ((rx + rw) > sd->size.w) rx = sd->size.w - rw; 2245 if ((rx + rw) > sd->size.w) rx = sd->size.w - rw;
2246 if ((ry + rh) > sd->size.h) ry = sd->size.h - rh; 2246 if ((ry + rh) > sd->size.h) ry = sd->size.h - rh;
2247 2247
2248 _elm_photocam_bounce_reset(obj, sd); 2248 _efl_ui_image_zoomable_bounce_reset(obj, sd);
2249 _elm_photocam_zoom_reset(obj, sd); 2249 _efl_ui_image_zoomable_zoom_reset(obj, sd);
2250 2250
2251 elm_interface_scrollable_region_bring_in(efl_super(obj, MY_CLASS), rx, ry, rw, rh); 2251 elm_interface_scrollable_region_bring_in(efl_super(obj, MY_CLASS), rx, ry, rw, rh);
2252} 2252}
2253 2253
2254EOLIAN static void 2254EOLIAN static void
2255_elm_photocam_efl_ui_zoom_zoom_animation_set(Eo *obj, Elm_Photocam_Data *sd, Eina_Bool paused) 2255_efl_ui_image_zoomable_efl_ui_zoom_zoom_animation_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, Eina_Bool paused)
2256{ 2256{
2257 paused = !!paused; 2257 paused = !!paused;
2258 2258
@@ -2260,12 +2260,12 @@ _elm_photocam_efl_ui_zoom_zoom_animation_set(Eo *obj, Elm_Photocam_Data *sd, Ein
2260 sd->paused = paused; 2260 sd->paused = paused;
2261 if (!sd->paused) return; 2261 if (!sd->paused) return;
2262 2262
2263 _elm_photocam_bounce_reset(obj, sd); 2263 _efl_ui_image_zoomable_bounce_reset(obj, sd);
2264 _elm_photocam_zoom_reset(obj, sd); 2264 _efl_ui_image_zoomable_zoom_reset(obj, sd);
2265} 2265}
2266 2266
2267EOLIAN static Eina_Bool 2267EOLIAN static Eina_Bool
2268_elm_photocam_efl_ui_zoom_zoom_animation_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd) 2268_efl_ui_image_zoomable_efl_ui_zoom_zoom_animation_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
2269{ 2269{
2270 return sd->paused; 2270 return sd->paused;
2271} 2271}
@@ -2291,7 +2291,7 @@ elm_photocam_bounce_get(const Evas_Object *obj,
2291} 2291}
2292 2292
2293EOLIAN static void 2293EOLIAN static void
2294_elm_photocam_gesture_enabled_set(Eo *obj, Elm_Photocam_Data *sd, Eina_Bool gesture) 2294_efl_ui_image_zoomable_gesture_enabled_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, Eina_Bool gesture)
2295{ 2295{
2296 gesture = !!gesture; 2296 gesture = !!gesture;
2297 2297
@@ -2322,13 +2322,13 @@ _elm_photocam_gesture_enabled_set(Eo *obj, Elm_Photocam_Data *sd, Eina_Bool gest
2322} 2322}
2323 2323
2324EOLIAN static Eina_Bool 2324EOLIAN static Eina_Bool
2325_elm_photocam_gesture_enabled_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd) 2325_efl_ui_image_zoomable_gesture_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
2326{ 2326{
2327 return sd->do_gesture; 2327 return sd->do_gesture;
2328} 2328}
2329 2329
2330EOLIAN static void 2330EOLIAN static void
2331_elm_photocam_class_constructor(Efl_Class *klass) 2331_efl_ui_image_zoomable_class_constructor(Efl_Class *klass)
2332{ 2332{
2333 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 2333 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
2334 2334
@@ -2341,7 +2341,7 @@ _elm_photocam_class_constructor(Efl_Class *klass)
2341} 2341}
2342 2342
2343EOLIAN const Elm_Atspi_Action * 2343EOLIAN const Elm_Atspi_Action *
2344_elm_photocam_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *pd EINA_UNUSED) 2344_efl_ui_image_zoomable_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *pd EINA_UNUSED)
2345{ 2345{
2346 static Elm_Atspi_Action atspi_actions[] = { 2346 static Elm_Atspi_Action atspi_actions[] = {
2347 { "move,prior", "move", "prior", _key_action_move}, 2347 { "move,prior", "move", "prior", _key_action_move},
@@ -2460,10 +2460,10 @@ elm_photocam_image_orient_get(const Eo *obj)
2460 2460
2461/* Internal EO APIs and hidden overrides */ 2461/* Internal EO APIs and hidden overrides */
2462 2462
2463#define ELM_PHOTOCAM_EXTRA_OPS \ 2463#define EFL_UI_IMAGE_ZOOMABLE_EXTRA_OPS \
2464 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_photocam) 2464 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_image_zoomable)
2465 2465
2466#include "elm_photocam.eo.c" 2466#include "efl_ui_image_zoomable.eo.c"
2467 2467
2468EAPI Evas_Object* 2468EAPI Evas_Object*
2469elm_photocam_internal_image_get(const Evas_Object *obj) 2469elm_photocam_internal_image_get(const Evas_Object *obj)
diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/efl_ui_image_zoomable.eo
index 1d0ddc5cad..3e4b88965a 100644
--- a/src/lib/elementary/elm_photocam.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -1,12 +1,12 @@
1class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable, 1class Efl.Ui.Image.Zoomable (Elm.Widget, Elm.Interface_Scrollable,
2 Elm.Interface.Atspi_Widget_Action, Efl.File, 2 Elm.Interface.Atspi_Widget_Action, Efl.File,
3 Efl.Ui.Clickable, Efl.Ui.Scrollable, Efl.Gfx.View, 3 Efl.Ui.Clickable, Efl.Ui.Scrollable, Efl.Gfx.View,
4 Efl.Ui.Zoom, Efl.Orientation, Efl.Flipable, Efl.Image) 4 Efl.Ui.Zoom, Efl.Orientation, Efl.Flipable, Efl.Image)
5{ 5{
6 [[Elementary photocam class]] 6 [[Elementary Image Zoomable class]]
7 legacy_prefix: elm_photocam; 7 legacy_prefix: elm_photocam;
8 eo_prefix: elm_obj_photocam; 8 //eo_prefix: elm_obj_photocam;
9 event_prefix: elm_photocam; 9 //event_prefix: elm_photocam;
10 methods { 10 methods {
11 @property gesture_enabled { 11 @property gesture_enabled {
12 set { 12 set {
diff --git a/src/lib/elementary/efl_ui_image_zoomable_eo.h b/src/lib/elementary/efl_ui_image_zoomable_eo.h
new file mode 100644
index 0000000000..b26d64b67e
--- /dev/null
+++ b/src/lib/elementary/efl_ui_image_zoomable_eo.h
@@ -0,0 +1,2 @@
1#include "efl_ui_image_zoomable_pan.eo.h"
2#include "efl_ui_image_zoomable.eo.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_photocam_pan.eo b/src/lib/elementary/efl_ui_image_zoomable_pan.eo
index ccc9b3ff30..51643902a1 100644
--- a/src/lib/elementary/elm_photocam_pan.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable_pan.eo
@@ -1,9 +1,9 @@
1class Elm.Photocam.Pan (Elm.Pan) 1class Efl.Ui.Image.Zoomable.Pan (Elm.Pan)
2{ 2{
3 [[Elementary photocom pan class]] 3 [[Elementary photocom pan class]]
4 legacy_prefix: elm_photocam_pan; 4 legacy_prefix: elm_photocam_pan;
5 eo_prefix: elm_obj_photocam_pan; 5 //eo_prefix: elm_obj_photocam_pan;
6 event_prefix: elm_photocam_pan; 6 //event_prefix: elm_photocam_pan;
7 implements { 7 implements {
8 class.constructor; 8 class.constructor;
9 Efl.Object.destructor; 9 Efl.Object.destructor;
diff --git a/src/lib/elementary/elm_widget_photocam.h b/src/lib/elementary/efl_ui_image_zoomable_private.h
index f1efba51d5..7f1358e7dd 100644
--- a/src/lib/elementary/elm_widget_photocam.h
+++ b/src/lib/elementary/efl_ui_image_zoomable_private.h
@@ -1,5 +1,5 @@
1#ifndef ELM_WIDGET_PHOTOCAM_H 1#ifndef EFL_UI_IMAGE_ZOOMABLE_PRIVATE_H
2#define ELM_WIDGET_PHOTOCAM_H 2#define EFL_UI_IMAGE_ZOOMABLE_PRIVATE_H
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5 5
@@ -23,15 +23,15 @@
23/** 23/**
24 * Base widget smart data extended with photocam instance data. 24 * Base widget smart data extended with photocam instance data.
25 */ 25 */
26typedef struct _Elm_Photocam_Data Elm_Photocam_Data; 26typedef struct _Efl_Ui_Image_Zoomable_Data Efl_Ui_Image_Zoomable_Data;
27typedef struct _Elm_Photocam_Pan_Data Elm_Photocam_Pan_Data; 27typedef struct _Efl_Ui_Image_Zoomable_Pan_Data Efl_Ui_Image_Zoomable_Pan_Data;
28typedef struct _Elm_Phocam_Grid Elm_Phocam_Grid; 28typedef struct _Efl_Ui_Image_Zoomable_Grid Efl_Ui_Image_Zoomable_Grid;
29typedef struct _Elm_Photocam_Grid_Item Elm_Photocam_Grid_Item; 29typedef struct _Efl_Ui_Image_Zoomable_Grid_Item Efl_Ui_Image_Zoomable_Grid_Item;
30 30
31struct _Elm_Photocam_Grid_Item 31struct _Efl_Ui_Image_Zoomable_Grid_Item
32{ 32{
33 Evas_Object *obj; 33 Evas_Object *obj;
34 Elm_Photocam_Data *sd; 34 Efl_Ui_Image_Zoomable_Data *sd;
35 Evas_Object *img; 35 Evas_Object *img;
36 36
37 struct 37 struct
@@ -43,7 +43,7 @@ struct _Elm_Photocam_Grid_Item
43 Eina_Bool have : 1; 43 Eina_Bool have : 1;
44}; 44};
45 45
46struct _Elm_Phocam_Grid 46struct _Efl_Ui_Image_Zoomable_Grid
47{ 47{
48 int tsize; /* size of tile (tsize x tsize pixels) */ 48 int tsize; /* size of tile (tsize x tsize pixels) */
49 int zoom; /* zoom level tiles want for optimal 49 int zoom; /* zoom level tiles want for optimal
@@ -52,12 +52,12 @@ struct _Elm_Phocam_Grid
52 int w, h; /* size of grid image in pixels 52 int w, h; /* size of grid image in pixels
53 * (represented by grid) */ 53 * (represented by grid) */
54 int gw, gh; /* size of grid in tiles */ 54 int gw, gh; /* size of grid in tiles */
55 Elm_Photocam_Grid_Item *grid; /* the grid (gw * gh items) */ 55 Efl_Ui_Image_Zoomable_Grid_Item *grid; /* the grid (gw * gh items) */
56 Eina_Bool dead : 1; /* old grid. will die as soon as anim is 56 Eina_Bool dead : 1; /* old grid. will die as soon as anim is
57 * over */ 57 * over */
58}; 58};
59 59
60struct _Elm_Photocam_Data 60struct _Efl_Ui_Image_Zoomable_Data
61{ 61{
62 Evas_Object *hit_rect; 62 Evas_Object *hit_rect;
63 Evas_Object *g_layer; 63 Evas_Object *g_layer;
@@ -135,10 +135,10 @@ struct _Elm_Photocam_Data
135 Eina_Bool orientation_changed : 1; 135 Eina_Bool orientation_changed : 1;
136}; 136};
137 137
138struct _Elm_Photocam_Pan_Data 138struct _Efl_Ui_Image_Zoomable_Pan_Data
139{ 139{
140 Evas_Object *wobj; 140 Evas_Object *wobj;
141 Elm_Photocam_Data *wsd; 141 Efl_Ui_Image_Zoomable_Data *wsd;
142}; 142};
143 143
144/** 144/**
@@ -146,10 +146,10 @@ struct _Elm_Photocam_Pan_Data
146 */ 146 */
147 147
148#define ELM_PHOTOCAM_DATA_GET(o, sd) \ 148#define ELM_PHOTOCAM_DATA_GET(o, sd) \
149 Elm_Photocam_Data * sd = efl_data_scope_get(o, ELM_PHOTOCAM_CLASS) 149 Efl_Ui_Image_Zoomable_Data * sd = efl_data_scope_get(o, EFL_UI_IMAGE_ZOOMABLE_CLASS)
150 150
151#define ELM_PHOTOCAM_PAN_DATA_GET(o, sd) \ 151#define ELM_PHOTOCAM_PAN_DATA_GET(o, sd) \
152 Elm_Photocam_Pan_Data * sd = efl_data_scope_get(o, ELM_PHOTOCAM_PAN_CLASS) 152 Efl_Ui_Image_Zoomable_Pan_Data * sd = efl_data_scope_get(o, EFL_UI_IMAGE_ZOOMABLE_PAN_CLASS)
153 153
154#define ELM_PHOTOCAM_DATA_GET_OR_RETURN(o, ptr) \ 154#define ELM_PHOTOCAM_DATA_GET_OR_RETURN(o, ptr) \
155 ELM_PHOTOCAM_DATA_GET(o, ptr); \ 155 ELM_PHOTOCAM_DATA_GET(o, ptr); \
@@ -170,7 +170,7 @@ struct _Elm_Photocam_Pan_Data
170 } 170 }
171 171
172#define ELM_PHOTOCAM_CHECK(obj) \ 172#define ELM_PHOTOCAM_CHECK(obj) \
173 if (EINA_UNLIKELY(!efl_isa((obj), ELM_PHOTOCAM_CLASS))) \ 173 if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_IMAGE_ZOOMABLE_CLASS))) \
174 return 174 return
175 175
176#endif 176#endif
diff --git a/src/lib/elementary/elm_photocam.h b/src/lib/elementary/elm_photocam.h
index 74cd16d7a9..54ffb6d463 100644
--- a/src/lib/elementary/elm_photocam.h
+++ b/src/lib/elementary/elm_photocam.h
@@ -81,7 +81,7 @@ struct _Elm_Photocam_Error
81}; 81};
82 82
83#ifdef EFL_EO_API_SUPPORT 83#ifdef EFL_EO_API_SUPPORT
84#include "elm_photocam_eo.h" 84#include "efl_ui_image_zoomable_eo.h"
85#endif 85#endif
86#ifndef EFL_NOLEGACY_API_SUPPORT 86#ifndef EFL_NOLEGACY_API_SUPPORT
87#include "elm_photocam_legacy.h" 87#include "elm_photocam_legacy.h"
diff --git a/src/lib/elementary/elm_photocam_eo.h b/src/lib/elementary/elm_photocam_eo.h
deleted file mode 100644
index 5036d6f25b..0000000000
--- a/src/lib/elementary/elm_photocam_eo.h
+++ /dev/null
@@ -1,2 +0,0 @@
1#include "elm_photocam_pan.eo.h"
2#include "elm_photocam.eo.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_photocam_legacy.h b/src/lib/elementary/elm_photocam_legacy.h
index d1e2e05884..c88a912660 100644
--- a/src/lib/elementary/elm_photocam_legacy.h
+++ b/src/lib/elementary/elm_photocam_legacy.h
@@ -219,4 +219,4 @@ EAPI void elm_photocam_zoom_mode_set(Evas_Object *obj, Elm_Photoca
219EAPI Elm_Photocam_Zoom_Mode elm_photocam_zoom_mode_get(const Evas_Object *obj); 219EAPI Elm_Photocam_Zoom_Mode elm_photocam_zoom_mode_get(const Evas_Object *obj);
220 220
221 221
222#include "elm_photocam.eo.legacy.h" 222#include "efl_ui_image_zoomable.eo.legacy.h"