summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarry <larry.olj@gmail.com>2016-02-10 19:53:27 -0200
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-02-22 10:38:26 -0300
commitee28ce8c3bfb250890a2ac3c0bbe3e57e5a7ab66 (patch)
tree10803c23461475ef9f8e92fe2237c010c0ac9c9c
parenta3bf6e4270d3b169c19055694f8c6f440068dab3 (diff)
elm.Image: use eolian eva.images enum values in elm_image.eo and remove unused elm_image_common.h
-rw-r--r--src/lib/Makefile.am1
-rw-r--r--src/lib/elm_image.eo25
-rw-r--r--src/lib/elm_image.h1
-rw-r--r--src/lib/elm_image_common.h26
4 files changed, 23 insertions, 30 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 40fb59746..7ea2597f6 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -253,7 +253,6 @@ elm_icon.h \
253elm_icon_eo.h \ 253elm_icon_eo.h \
254elm_icon_legacy.h \ 254elm_icon_legacy.h \
255elm_image.h \ 255elm_image.h \
256elm_image_common.h \
257elm_image_eo.h \ 256elm_image_eo.h \
258elm_image_legacy.h \ 257elm_image_legacy.h \
259elm_index.h \ 258elm_index.h \
diff --git a/src/lib/elm_image.eo b/src/lib/elm_image.eo
index c16599cc7..dada8c5f1 100644
--- a/src/lib/elm_image.eo
+++ b/src/lib/elm_image.eo
@@ -1,4 +1,25 @@
1type Elm.Image.Orient: Evas_Image_Orient; [[Using Evas_Image_Orient enums. @since 1.14]] 1import evas_image;
2
3enum Elm.Image_Orient
4{
5 [[
6 Using Evas_Image_Orient enums.
7 @since 1.14
8 ]]
9 legacy: elm_image;
10 orient_none = Evas.Image_Orient.orient_none,
11 orient_0 = Evas.Image_Orient.orient_0,
12 rotate_90 = Evas.Image_Orient.orient_90,
13 orient_90 = Evas.Image_Orient.orient_90,
14 rotate_180 = Evas.Image_Orient.orient_180,
15 orient_180 = Evas.Image_Orient.orient_180,
16 rotate_270 = Evas.Image_Orient.orient_270,
17 orient_270 = Evas.Image_Orient.orient_270,
18 flip_horizontal = Evas.Image_Orient.flip_horizontal,
19 flip_vertical = Evas.Image_Orient.flip_vertical,
20 flip_transpose = Evas.Image_Orient.flip_transpose,
21 flip_transverse = Evas.Image_Orient.flip_transverse
22}
2 23
3struct Elm.Image.Progress 24struct Elm.Image.Progress
4{ 25{
@@ -161,7 +182,7 @@ class Elm.Image (Elm.Widget, Efl.File, Efl.Image, Evas.Clickable_Interface,
161 get { 182 get {
162 } 183 }
163 values { 184 values {
164 orient: Elm.Image.Orient; [[The image orientation Elm.Image.Orient Default is #ELM_IMAGE_ORIENT_NONE.]] 185 orient: Elm.Image_Orient; [[The image orientation Elm.Image.Orient Default is #ELM_IMAGE_ORIENT_NONE.]]
165 } 186 }
166 } 187 }
167 @property fill_outside { 188 @property fill_outside {
diff --git a/src/lib/elm_image.h b/src/lib/elm_image.h
index 2041ab1b5..c14dc23a4 100644
--- a/src/lib/elm_image.h
+++ b/src/lib/elm_image.h
@@ -41,7 +41,6 @@
41 * @{ 41 * @{
42 */ 42 */
43 43
44#include <elm_image_common.h>
45#ifdef EFL_EO_API_SUPPORT 44#ifdef EFL_EO_API_SUPPORT
46#include <elm_image_eo.h> 45#include <elm_image_eo.h>
47#endif 46#endif
diff --git a/src/lib/elm_image_common.h b/src/lib/elm_image_common.h
deleted file mode 100644
index 8e670cbb2..000000000
--- a/src/lib/elm_image_common.h
+++ /dev/null
@@ -1,26 +0,0 @@
1/**
2 * @addtogroup Image
3 *
4 * @{
5 */
6
7/**
8 * Using Evas_Image_Orient enums
9 * @since 1.14
10 */
11#define ELM_IMAGE_ORIENT_NONE EVAS_IMAGE_ORIENT_NONE
12#define ELM_IMAGE_ORIENT_0 EVAS_IMAGE_ORIENT_0
13#define ELM_IMAGE_ROTATE_90 EVAS_IMAGE_ORIENT_90
14#define ELM_IMAGE_ORIENT_90 EVAS_IMAGE_ORIENT_90
15#define ELM_IMAGE_ROTATE_180 EVAS_IMAGE_ORIENT_180
16#define ELM_IMAGE_ORIENT_180 EVAS_IMAGE_ORIENT_180
17#define ELM_IMAGE_ROTATE_270 EVAS_IMAGE_ORIENT_270
18#define ELM_IMAGE_ORIENT_270 EVAS_IMAGE_ORIENT_270
19#define ELM_IMAGE_FLIP_HORIZONTAL EVAS_IMAGE_FLIP_HORIZONTAL
20#define ELM_IMAGE_FLIP_VERTICAL EVAS_IMAGE_FLIP_VERTICAL
21#define ELM_IMAGE_FLIP_TRANSPOSE EVAS_IMAGE_FLIP_TRANSPOSE
22#define ELM_IMAGE_FLIP_TRANSVERSE EVAS_IMAGE_FLIP_TRANSVERSE
23
24/**
25 * @}
26 */