summaryrefslogtreecommitdiff
path: root/src/edje_externals
diff options
context:
space:
mode:
authorGustavo Lima Chaves <glima@profusion.mobi>2012-05-28 21:50:11 +0000
committerGustavo Lima Chaves <glima@profusion.mobi>2012-05-28 21:50:11 +0000
commitb3108cf22d53f0ba689e808f0be11a159025a01b (patch)
treecd16c020af1e93d03c1d87a514b5e4ba8cf99f21 /src/edje_externals
parent50a728ff2bd8582e53f3e98766e6ad7d99d23a91 (diff)
[elm] And now remove deprecated calls usage (WRT
icon/image thing). SVN revision: 71473
Diffstat (limited to 'src/edje_externals')
-rw-r--r--src/edje_externals/elm.c2
-rw-r--r--src/edje_externals/elm_icon.c30
2 files changed, 16 insertions, 16 deletions
diff --git a/src/edje_externals/elm.c b/src/edje_externals/elm.c
index ced69b80e..80b7248b5 100644
--- a/src/edje_externals/elm.c
+++ b/src/edje_externals/elm.c
@@ -236,7 +236,7 @@ external_common_param_icon_get(Evas_Object *obj, const Edje_External_Param *p)
236 parent_widget = edje; 236 parent_widget = edje;
237 icon = elm_icon_add(parent_widget); 237 icon = elm_icon_add(parent_widget);
238 238
239 if (elm_icon_file_set(icon, file, p->s)) 239 if (elm_image_file_set(icon, file, p->s))
240 return icon; 240 return icon;
241 if (elm_icon_standard_set(icon, p->s)) 241 if (elm_icon_standard_set(icon, p->s))
242 return icon; 242 return icon;
diff --git a/src/edje_externals/elm_icon.c b/src/edje_externals/elm_icon.c
index fbd1c5fef..ee056ae38 100644
--- a/src/edje_externals/elm_icon.c
+++ b/src/edje_externals/elm_icon.c
@@ -37,22 +37,22 @@ external_icon_state_set(void *data __UNUSED__, Evas_Object *obj,
37 37
38 if (p->file) 38 if (p->file)
39 { 39 {
40 elm_icon_file_set(obj, p->file, NULL); 40 elm_image_file_set(obj, p->file, NULL);
41 param_icon->file = p->file; 41 param_icon->file = p->file;
42 } 42 }
43 if (p->smooth_exists) 43 if (p->smooth_exists)
44 { 44 {
45 elm_icon_smooth_set(obj, p->smooth); 45 elm_image_smooth_set(obj, p->smooth);
46 param_icon->smooth = p->smooth; 46 param_icon->smooth = p->smooth;
47 } 47 }
48 if (p->no_scale_exists) 48 if (p->no_scale_exists)
49 { 49 {
50 elm_icon_no_scale_set(obj, p->no_scale); 50 elm_image_no_scale_set(obj, p->no_scale);
51 param_icon->no_scale = p->no_scale; 51 param_icon->no_scale = p->no_scale;
52 } 52 }
53 if (p->scale_up_exists && p->scale_down_exists) 53 if (p->scale_up_exists && p->scale_down_exists)
54 { 54 {
55 elm_icon_resizable_set(obj, p->scale_up, p->scale_down); 55 elm_image_resizable_set(obj, p->scale_up, p->scale_down);
56 param_icon->scale_up = p->scale_up; 56 param_icon->scale_up = p->scale_up;
57 param_icon->scale_down = p->scale_down; 57 param_icon->scale_down = p->scale_down;
58 } 58 }
@@ -60,12 +60,12 @@ external_icon_state_set(void *data __UNUSED__, Evas_Object *obj,
60 { 60 {
61 if (p->scale_up_exists) 61 if (p->scale_up_exists)
62 { 62 {
63 elm_icon_resizable_set(obj, p->scale_up, param_icon->scale_down); 63 elm_image_resizable_set(obj, p->scale_up, param_icon->scale_down);
64 param_icon->scale_up = p->scale_up; 64 param_icon->scale_up = p->scale_up;
65 } 65 }
66 else 66 else
67 { 67 {
68 elm_icon_resizable_set(obj, param_icon->scale_up, p->scale_down); 68 elm_image_resizable_set(obj, param_icon->scale_up, p->scale_down);
69 param_icon->scale_down = p->scale_down; 69 param_icon->scale_down = p->scale_down;
70 } 70 }
71 } 71 }
@@ -76,7 +76,7 @@ external_icon_state_set(void *data __UNUSED__, Evas_Object *obj,
76 } 76 }
77 if (p->prescale_size_exists) 77 if (p->prescale_size_exists)
78 { 78 {
79 elm_icon_prescale_set(obj, p->prescale_size); 79 elm_image_prescale_set(obj, p->prescale_size);
80 param_icon->prescale_size = p->prescale_size; 80 param_icon->prescale_size = p->prescale_size;
81 } 81 }
82 if (p->icon) 82 if (p->icon)
@@ -84,7 +84,7 @@ external_icon_state_set(void *data __UNUSED__, Evas_Object *obj,
84 edje = evas_object_smart_parent_get(obj); 84 edje = evas_object_smart_parent_get(obj);
85 edje_object_file_get(edje, &file, NULL); 85 edje_object_file_get(edje, &file, NULL);
86 86
87 if (!elm_icon_file_set(obj, file, p->icon)) 87 if (!elm_image_file_set(obj, file, p->icon))
88 elm_icon_standard_set(obj, p->icon); 88 elm_icon_standard_set(obj, p->icon);
89 } 89 }
90} 90}
@@ -99,7 +99,7 @@ external_icon_param_set(void *data __UNUSED__, Evas_Object *obj,
99 if (!strcmp(param->name, "file") 99 if (!strcmp(param->name, "file")
100 && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) 100 && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
101 { 101 {
102 Eina_Bool ret = elm_icon_file_set(obj, param->s, NULL); 102 Eina_Bool ret = elm_image_file_set(obj, param->s, NULL);
103 if (ret) 103 if (ret)
104 param_icon->file = param->s; 104 param_icon->file = param->s;
105 return ret; 105 return ret;
@@ -107,28 +107,28 @@ external_icon_param_set(void *data __UNUSED__, Evas_Object *obj,
107 else if (!strcmp(param->name, "smooth") 107 else if (!strcmp(param->name, "smooth")
108 && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 108 && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
109 { 109 {
110 elm_icon_smooth_set(obj, param->i); 110 elm_image_smooth_set(obj, param->i);
111 param_icon->smooth = param->i; 111 param_icon->smooth = param->i;
112 return EINA_TRUE; 112 return EINA_TRUE;
113 } 113 }
114 else if (!strcmp(param->name, "no scale") 114 else if (!strcmp(param->name, "no scale")
115 && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 115 && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
116 { 116 {
117 elm_icon_no_scale_set(obj, param->i); 117 elm_image_no_scale_set(obj, param->i);
118 param_icon->no_scale = param->i; 118 param_icon->no_scale = param->i;
119 return EINA_TRUE; 119 return EINA_TRUE;
120 } 120 }
121 else if (!strcmp(param->name, "scale up") 121 else if (!strcmp(param->name, "scale up")
122 && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 122 && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
123 { 123 {
124 elm_icon_resizable_set(obj, param->i, param_icon->scale_down); 124 elm_image_resizable_set(obj, param->i, param_icon->scale_down);
125 param_icon->scale_up = param->i; 125 param_icon->scale_up = param->i;
126 return EINA_TRUE; 126 return EINA_TRUE;
127 } 127 }
128 else if (!strcmp(param->name, "scale down") 128 else if (!strcmp(param->name, "scale down")
129 && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 129 && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
130 { 130 {
131 elm_icon_resizable_set(obj, param_icon->scale_up, param->i); 131 elm_image_resizable_set(obj, param_icon->scale_up, param->i);
132 param_icon->scale_down = param->i; 132 param_icon->scale_down = param->i;
133 return EINA_TRUE; 133 return EINA_TRUE;
134 } 134 }
@@ -142,7 +142,7 @@ external_icon_param_set(void *data __UNUSED__, Evas_Object *obj,
142 else if (!strcmp(param->name, "prescale") 142 else if (!strcmp(param->name, "prescale")
143 && param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) 143 && param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
144 { 144 {
145 elm_icon_prescale_set(obj, param->i); 145 elm_image_prescale_set(obj, param->i);
146 param_icon->prescale_size = param->i; 146 param_icon->prescale_size = param->i;
147 return EINA_TRUE; 147 return EINA_TRUE;
148 } 148 }
@@ -153,7 +153,7 @@ external_icon_param_set(void *data __UNUSED__, Evas_Object *obj,
153 edje = evas_object_smart_parent_get(obj); 153 edje = evas_object_smart_parent_get(obj);
154 edje_object_file_get(edje, &file, NULL); 154 edje_object_file_get(edje, &file, NULL);
155 155
156 if (!elm_icon_file_set(obj, file, param->s)) 156 if (!elm_image_file_set(obj, file, param->s))
157 elm_icon_standard_set(obj, param->s); 157 elm_icon_standard_set(obj, param->s);
158 return EINA_TRUE; 158 return EINA_TRUE;
159 } 159 }