summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2012-06-07 11:41:00 +0000
committerDaniel Juyung Seo <seojuyung2@gmail.com>2012-06-07 11:41:00 +0000
commitc034d0c0e7ff2402742bfdf4091c27fd569e3c6c (patch)
tree2efa7e4d5da6806425760c3349cf654fc4eba306
parent1a636cd8b74293639057ddba5bf6971564a2c94a (diff)
elfe: Applied elm_icon API change.
SVN revision: 71805
-rw-r--r--src/allapps.c10
-rw-r--r--src/utils.c10
2 files changed, 10 insertions, 10 deletions
diff --git a/src/allapps.c b/src/allapps.c
index 8c6de10..9ac5862 100644
--- a/src/allapps.c
+++ b/src/allapps.c
@@ -58,9 +58,9 @@ _content_get(void *data, Evas_Object *obj, const char *part)
58 { 58 {
59 ic = elm_icon_add(obj); 59 ic = elm_icon_add(obj);
60 if (gitem->icon_path && gitem->icon_path[0] == '/') 60 if (gitem->icon_path && gitem->icon_path[0] == '/')
61 elm_icon_file_set(ic, gitem->icon_path, NULL); 61 elm_image_file_set(ic, gitem->icon_path, NULL);
62 else 62 else
63 elm_icon_file_set(ic, elfe_home_cfg->theme, gitem->icon_path); 63 elm_image_file_set(ic, elfe_home_cfg->theme, gitem->icon_path);
64 evas_object_size_hint_min_set(ic, elfe_home_cfg->icon_size, elfe_home_cfg->icon_size); 64 evas_object_size_hint_min_set(ic, elfe_home_cfg->icon_size, elfe_home_cfg->icon_size);
65 evas_object_size_hint_max_set(ic, elfe_home_cfg->icon_size, elfe_home_cfg->icon_size); 65 evas_object_size_hint_max_set(ic, elfe_home_cfg->icon_size, elfe_home_cfg->icon_size);
66 } 66 }
@@ -265,7 +265,7 @@ elfe_allapps_add(Evas_Object *parent)
265 bt = elm_button_add(allapps->selector); 265 bt = elm_button_add(allapps->selector);
266 elm_object_text_set(bt, "Apps"); 266 elm_object_text_set(bt, "Apps");
267 ic = elm_icon_add(bt); 267 ic = elm_icon_add(bt);
268 elm_icon_file_set(ic, elfe_home_cfg->theme, "icon/applications"); 268 elm_image_file_set(ic, elfe_home_cfg->theme, "icon/applications");
269 evas_object_show(ic); 269 evas_object_show(ic);
270 elm_object_content_set(bt, ic); 270 elm_object_content_set(bt, ic);
271 evas_object_show(bt); 271 evas_object_show(bt);
@@ -280,7 +280,7 @@ elfe_allapps_add(Evas_Object *parent)
280 bt = elm_button_add(allapps->selector); 280 bt = elm_button_add(allapps->selector);
281 elm_object_text_set(bt, "Widgets"); 281 elm_object_text_set(bt, "Widgets");
282 ic = elm_icon_add(bt); 282 ic = elm_icon_add(bt);
283 elm_icon_file_set(ic, elfe_home_cfg->theme, "icon/widgets"); 283 elm_image_file_set(ic, elfe_home_cfg->theme, "icon/widgets");
284 evas_object_show(ic); 284 evas_object_show(ic);
285 elm_object_content_set(bt, ic); 285 elm_object_content_set(bt, ic);
286 evas_object_show(bt); 286 evas_object_show(bt);
@@ -295,7 +295,7 @@ elfe_allapps_add(Evas_Object *parent)
295 bt = elm_button_add(allapps->selector); 295 bt = elm_button_add(allapps->selector);
296 elm_object_text_set(bt, "Config"); 296 elm_object_text_set(bt, "Config");
297 ic = elm_icon_add(bt); 297 ic = elm_icon_add(bt);
298 elm_icon_file_set(ic, elfe_home_cfg->theme, "icon/configuration"); 298 elm_image_file_set(ic, elfe_home_cfg->theme, "icon/configuration");
299 evas_object_show(ic); 299 evas_object_show(ic);
300 elm_object_content_set(bt, ic); 300 elm_object_content_set(bt, ic);
301 evas_object_show(bt); 301 evas_object_show(bt);
diff --git a/src/utils.c b/src/utils.c
index 6bd823d..95acc8d 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -15,13 +15,13 @@ elfe_utils_fdo_icon_add(Evas_Object *parent, const char *icon, int size)
15 15
16 if (!icon) 16 if (!icon)
17 { 17 {
18 elm_icon_file_set(ic, elfe_home_cfg->theme, "icon/application-default"); 18 elm_image_file_set(ic, elfe_home_cfg->theme, "icon/application-default");
19 return ic; 19 return ic;
20 } 20 }
21 21
22 if (icon && icon[0] == '/') 22 if (icon && icon[0] == '/')
23 { 23 {
24 elm_icon_file_set(ic, icon, NULL); 24 elm_image_file_set(ic, icon, NULL);
25 return ic; 25 return ic;
26 } 26 }
27 27
@@ -44,9 +44,9 @@ elfe_utils_fdo_icon_add(Evas_Object *parent, const char *icon, int size)
44 } 44 }
45 45
46 if (path) 46 if (path)
47 elm_icon_file_set(ic, path, NULL); 47 elm_image_file_set(ic, path, NULL);
48 else if (!elm_icon_file_set(ic, elfe_home_cfg->theme, icon)) 48 else if (!elm_image_file_set(ic, elfe_home_cfg->theme, icon))
49 elm_icon_file_set(ic, elfe_home_cfg->theme, "icon/application-default"); 49 elm_image_file_set(ic, elfe_home_cfg->theme, "icon/application-default");
50 50
51 return ic; 51 return ic;
52} 52}