kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm_image: rename the elm_image into efl_ui_image.

This commit is contained in:
Ji-Youn Park 2016-05-31 19:08:21 +08:30
parent b8d1db365b
commit a0ec05cd8f
8 changed files with 274 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile_Elementary.am
View File

@ -39,7 +39,7 @@ elm_public_eolian_files = \
lib/elementary/elm_hover.eo \
lib/elementary/elm_hoversel.eo \
lib/elementary/elm_icon.eo \
lib/elementary/elm_image.eo \
lib/elementary/efl_ui_image.eo \
lib/elementary/elm_index.eo \
lib/elementary/elm_interface_atspi_accessible.eo \
lib/elementary/elm_interface_atspi_action.eo \
@ -219,7 +219,7 @@ includesunstable_HEADERS = \
lib/elementary/elm_widget_hover.h \
lib/elementary/elm_widget_hoversel.h \
lib/elementary/elm_widget_icon.h \
lib/elementary/elm_widget_image.h \
lib/elementary/efl_ui_widget_image.h \
lib/elementary/elm_widget_index.h \
lib/elementary/elm_widget_inwin.h \
lib/elementary/elm_widget_label.h \
@ -584,7 +584,7 @@ lib_elementary_libelementary_la_SOURCES = \
lib/elementary/elm_grid.c \
lib/elementary/elm_hover.c \
lib/elementary/elm_icon.c \
lib/elementary/elm_image.c \
lib/elementary/efl_ui_image.c \
lib/elementary/elm_index.c \
lib/elementary/elm_interface_atspi_accessible.c \
lib/elementary/elm_interface_atspi_action.c \

1
src/lib/elementary/Elementary.h.in
View File

@ -271,6 +271,7 @@ EAPI extern Elm_Version *elm_version;
# include <efl_ui_box.eo.h>
# include <efl_ui_box_flow.eo.h>
# include <efl_ui_grid.eo.h>
# include <efl_ui_image.eo.h>
#endif
/* include deprecated calls last of all */

6
src/lib/elementary/Makefile.am
View File

@ -44,7 +44,7 @@ elm_eolian_files = \
elm_hover.eo \
elm_hoversel.eo \
elm_icon.eo \
elm_image.eo \
efl_ui_image.eo \
elm_index.eo \
elm_interface_atspi_accessible.eo \
elm_interface_atspi_action.eo \
@ -191,7 +191,7 @@ includesunstable_HEADERS = \
elm_widget_hover.h \
elm_widget_hoversel.h \
elm_widget_icon.h \
elm_widget_image.h \
efl_ui_widget_image.h \
elm_widget_index.h \
elm_widget_inwin.h \
elm_widget_label.h \
@ -553,7 +553,7 @@ libelementary_la_SOURCES = \
elm_grid.c \
elm_hover.c \
elm_icon.c \
elm_image.c \
efl_ui_image.c \
elm_index.c \
elm_interface_atspi_accessible.c \
elm_interface_atspi_action.c \

474
src/lib/elementary/elm_image.c → src/lib/elementary/efl_ui_image.c
View File

File diff suppressed because it is too large Load Diff

14
src/lib/elementary/elm_image.eo → src/lib/elementary/efl_ui_image.eo
View File

@ -1,6 +1,6 @@
import evas_image;
enum Elm.Image.Scale_Type
enum Efl.Ui.Image.Scale_Type
{
[[Enumeration that defines scale types for the object's internal image.
@ -24,7 +24,7 @@ enum Elm.Image.Scale_Type
none [[Not scale the internal image]]
}
struct Elm.Image.Progress
struct Efl.Ui.Image.Progress
{
[[
Structure associated with smart callback 'download,progress'.
@ -34,7 +34,7 @@ struct Elm.Image.Progress
total: double;
}
struct Elm.Image.Error
struct Efl.Ui.Image.Error
{
[[
Structure associated with smart callback 'download,progress'.
@ -44,14 +44,12 @@ struct Elm.Image.Error
open_error: bool;
}
class Elm.Image (Elm.Widget, Evas.Clickable_Interface, Evas.Draggable_Interface,
class Efl.Ui.Image (Elm.Widget, Evas.Clickable_Interface, Evas.Draggable_Interface,
Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View,
Elm.Interface.Atspi_Image, Elm.Interface.Atspi_Widget_Action,
Edje.Object, Efl.Orientation, Efl.Flipable)
{
legacy_prefix: elm_image;
eo_prefix: elm_obj_image;
event_prefix: elm_image;
event_prefix: efl_ui_image;
methods {
@property scale_type {
[[Control how the internal image is scaled.
@ -62,7 +60,7 @@ class Elm.Image (Elm.Widget, Evas.Clickable_Interface, Evas.Draggable_Interface,
get {
}
values {
scale_type: Elm.Image.Scale_Type;
scale_type: Efl.Ui.Image.Scale_Type;
}
}
@property scalable {

34
src/lib/elementary/elm_widget_image.h → src/lib/elementary/efl_ui_widget_image.h
View File

@ -12,11 +12,11 @@
typedef struct _Async_Open_Data Async_Open_Data;
typedef enum
{
ELM_IMAGE_PRELOAD_ENABLED,
ELM_IMAGE_PRELOADING,
ELM_IMAGE_PRELOADED,
ELM_IMAGE_PRELOAD_DISABLED
} Elm_Image_Preload_Status;
EFL_UI_IMAGE_PRELOAD_ENABLED,
EFL_UI_IMAGE_PRELOADING,
EFL_UI_IMAGE_PRELOADED,
EFL_UI_IMAGE_PRELOAD_DISABLED
} Efl_Ui_Image_Preload_Status;
/**
* @addtogroup Widget
@ -40,8 +40,8 @@ typedef enum
/**
* Base widget smart data extended with image instance data.
*/
typedef struct _Elm_Image_Data Elm_Image_Data;
struct _Elm_Image_Data
typedef struct _Efl_Ui_Image_Data Efl_Ui_Image_Data;
struct _Efl_Ui_Image_Data
{
Evas_Object *hit_rect;
Evas_Object *img;
@ -73,8 +73,8 @@ struct _Elm_Image_Data
Eina_Spinlock lck;
} async;
Elm_Image_Preload_Status preload_status;
Elm_Image_Scale_Type scale_type;
Efl_Ui_Image_Preload_Status preload_status;
Efl_Ui_Image_Scale_Type scale_type;
const char *stdicon;
@ -106,11 +106,11 @@ struct _Elm_Image_Data
* @}
*/
#define ELM_IMAGE_DATA_GET(o, sd) \
Elm_Image_Data * sd = eo_data_scope_get(o, ELM_IMAGE_CLASS)
#define EFL_UI_IMAGE_DATA_GET(o, sd) \
Efl_Ui_Image_Data * sd = eo_data_scope_get(o, EFL_UI_IMAGE_CLASS)
#define ELM_IMAGE_DATA_GET_OR_RETURN(o, ptr) \
ELM_IMAGE_DATA_GET(o, ptr); \
#define EFL_UI_IMAGE_DATA_GET_OR_RETURN(o, ptr) \
EFL_UI_IMAGE_DATA_GET(o, ptr); \
if (EINA_UNLIKELY(!ptr)) \
{ \
CRI("No widget data for object %p (%s)", \
@ -118,8 +118,8 @@ struct _Elm_Image_Data
return; \
}
#define ELM_IMAGE_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
ELM_IMAGE_DATA_GET(o, ptr); \
#define EFL_UI_IMAGE_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
EFL_UI_IMAGE_DATA_GET(o, ptr); \
if (EINA_UNLIKELY(!ptr)) \
{ \
CRI("No widget data for object %p (%s)", \
@ -127,8 +127,8 @@ struct _Elm_Image_Data
return val; \
}
#define ELM_IMAGE_CHECK(obj) \
if (EINA_UNLIKELY(!eo_isa((obj), ELM_IMAGE_CLASS))) \
#define EFL_UI_IMAGE_CHECK(obj) \
if (EINA_UNLIKELY(!eo_isa((obj), EFL_UI_IMAGE_CLASS))) \
return
#endif

12
src/lib/elementary/elm_icon.c
View File

@ -8,7 +8,7 @@
#include "elm_priv.h"
#include "elm_widget_icon.h"
#include "elm_widget_image.h"
#include "efl_ui_widget_image.h"
#define NON_EXISTING (void *)-1
@ -298,7 +298,7 @@ static void
_edje_signals_free(Elm_Icon_Data *sd)
{
Edje_Signal_Data *esd;
Elm_Image_Data *id = eo_data_scope_get(sd->obj, ELM_IMAGE_CLASS);
Efl_Ui_Image_Data *id = eo_data_scope_get(sd->obj, EFL_UI_IMAGE_CLASS);
EINA_LIST_FREE(sd->edje_signals, esd)
{
@ -316,7 +316,7 @@ _elm_icon_efl_file_file_set(Eo *obj, Elm_Icon_Data *sd, const char *file, const
{
Evas_Object *pclip;
Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS);
Efl_Ui_Image_Data *id = eo_data_scope_get(obj, EFL_UI_IMAGE_CLASS);
EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE);
@ -527,7 +527,7 @@ _elm_icon_signal_emit(Evas_Object *obj,
const char *source)
{
Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS);
Efl_Ui_Image_Data *id = eo_data_scope_get(obj, EFL_UI_IMAGE_CLASS);
if (!id->edje) return;
@ -545,7 +545,7 @@ _elm_icon_signal_callback_add(Evas_Object *obj,
Edje_Signal_Data *esd;
ELM_ICON_DATA_GET(obj, sd);
Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS);
Efl_Ui_Image_Data *id = eo_data_scope_get(obj, EFL_UI_IMAGE_CLASS);
if (!id->edje) return;
@ -576,7 +576,7 @@ _elm_icon_signal_callback_del(Evas_Object *obj,
Eina_List *l;
ELM_ICON_DATA_GET(obj, sd);
Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS);
Efl_Ui_Image_Data *id = eo_data_scope_get(obj, EFL_UI_IMAGE_CLASS);
if (!id->edje) return NULL;

2
src/lib/elementary/elm_icon.eo
View File

@ -6,7 +6,7 @@ enum Elm.Icon.Type
standard
}
class Elm.Icon (Elm.Image)
class Elm.Icon (Efl.Ui.Image)
{
legacy_prefix: elm_icon;
eo_prefix: elm_obj_icon;