ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=36113b1535508f8c72c7415dc1015da1f81c3274
commit 36113b1535508f8c72c7415dc1015da1f81c3274
Author: Andy Williams <a...@andywilliams.me>
Date: Wed Apr 27 00:01:08 2016 +0100
elementary: fix a few non-standard icon names
moving the widgets away from non-standard names.
Tidy the icon sets to clarify what's standard.
---
data/elementary/themes/edc/elm/icon.edc | 13 +++++--------
src/bin/elementary/test_entry.c | 4 ++--
src/bin/elementary/test_genlist.c | 2 +-
src/bin/elementary/test_naviframe.c | 2 +-
src/lib/elementary/elc_fileselector.c | 6 +++---
src/lib/elementary/elc_naviframe.c | 2 +-
src/lib/elementary/elm_icon_legacy.h | 7 +++----
7 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/data/elementary/themes/edc/elm/icon.edc
b/data/elementary/themes/edc/elm/icon.edc
index 41cd654..e4d3e1d 100644
--- a/data/elementary/themes/edc/elm/icon.edc
+++ b/data/elementary/themes/edc/elm/icon.edc
@@ -31,14 +31,11 @@ IC("document-edit", "icon_edit.png", 16,
0);
IC("dialog-info", "icon_info.png", 16, 0);
IC("dialog-close", "icon_close.png", 16, 0);
-IC("arrow-up", "icon_arrow_up.png", 16, 0);
-IC("arrow-down", "icon_arrow_down.png", 16, 0);
-IC("arrow-left", "icon_arrow_left.png", 16, 0);
-IC("arrow-right", "icon_arrow_right.png", 16, 0);
-IC("arrow-up-left", "icon_arrow_up_left.png", 16, 0); /* */
-IC("arrow-up-right", "icon_arrow_up_right.png", 16, 0); /* */
-IC("arrow-down-left", "icon_arrow_down_left.png", 16, 0); /* */
-IC("arrow-down-right", "icon_arrow_down_right.png", 16, 0); /* */
+IC("go-home", "icon_home.png", 16, 0);
+IC("go-up", "icon_arrow_up.png", 16, 0);
+IC("go-down", "icon_arrow_down.png", 16, 0);
+IC("go-previous", "icon_arrow_left.png", 16, 0);
+IC("go-next", "icon_arrow_right.png", 16, 0);
IC("edit-delete", "icon_delete.png", 16, 0);
IC("edit-find", "icon_search.png", 16, 0);
diff --git a/src/bin/elementary/test_entry.c b/src/bin/elementary/test_entry.c
index 1a56d00..388059f 100644
--- a/src/bin/elementary/test_entry.c
+++ b/src/bin/elementary/test_entry.c
@@ -537,7 +537,7 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void *
evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
bt = elm_icon_add(win);
- elm_icon_standard_set(bt, "home");
+ elm_icon_standard_set(bt, "go-home");
evas_object_size_hint_min_set(bt, 48, 48);
evas_object_color_set(bt, 128, 0, 0, 128);
evas_object_show(bt);
@@ -2340,7 +2340,7 @@ test_entry8(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_in
elm_grid_pack(gd, en3, 5, 35, 90, 20);
bt = elm_icon_add(win);
- elm_icon_standard_set(bt, "home");
+ elm_icon_standard_set(bt, "go-home");
evas_object_size_hint_min_set(bt, 48, 48);
evas_object_color_set(bt, 128, 0, 0, 128);
evas_object_show(bt);
diff --git a/src/bin/elementary/test_genlist.c
b/src/bin/elementary/test_genlist.c
index c8ee4ed..3be11a1 100644
--- a/src/bin/elementary/test_genlist.c
+++ b/src/bin/elementary/test_genlist.c
@@ -178,7 +178,7 @@ Evas_Object *gl_content_full_get(void *data EINA_UNUSED,
Evas_Object *obj, const
elm_box_horizontal_set(bx, EINA_TRUE);
ic = elm_icon_add(bx);
- elm_icon_standard_set(ic, "home");
+ elm_icon_standard_set(ic, "go-home");
evas_object_size_hint_min_set(ic,
ELM_SCALE_SIZE(32),
ELM_SCALE_SIZE(32));
diff --git a/src/bin/elementary/test_naviframe.c
b/src/bin/elementary/test_naviframe.c
index 222b450..4a8e4e8 100644
--- a/src/bin/elementary/test_naviframe.c
+++ b/src/bin/elementary/test_naviframe.c
@@ -193,7 +193,7 @@ _page4(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
snprintf(img4, sizeof(img4), "%s/images/rock_02.jpg",
elm_app_data_dir_get());
ic = elm_icon_add(nf);
- elm_icon_standard_set(ic, "arrow_right");
+ elm_icon_standard_set(ic, "go-right");
bt = elm_button_add(nf);
evas_object_smart_callback_add(bt, "clicked", _page5, nf);
diff --git a/src/lib/elementary/elc_fileselector.c
b/src/lib/elementary/elc_fileselector.c
index 79f5e26a..a2d49ae 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -1466,7 +1466,7 @@ _elm_fileselector_evas_object_smart_add(Eo *obj,
Elm_Fileselector_Data *priv)
// up btn
ic = elm_icon_add(obj);
- elm_icon_standard_set(ic, "arrow_up");
+ elm_icon_standard_set(ic, "go-up");
bt = elm_button_add(obj);
elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
elm_object_part_content_set(bt, "icon", ic);
@@ -1480,7 +1480,7 @@ _elm_fileselector_evas_object_smart_add(Eo *obj,
Elm_Fileselector_Data *priv)
// home btn
ic = elm_icon_add(obj);
- elm_icon_standard_set(ic, "home");
+ elm_icon_standard_set(ic, "go-home");
bt = elm_button_add(obj);
elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
elm_object_part_content_set(bt, "icon", ic);
@@ -1494,7 +1494,7 @@ _elm_fileselector_evas_object_smart_add(Eo *obj,
Elm_Fileselector_Data *priv)
// search entry
ic = elm_icon_add(obj);
- elm_icon_standard_set(ic, "search");
+ elm_icon_standard_set(ic, "edit-find");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
en = elm_entry_add(obj);
elm_entry_scrollable_set(en, EINA_TRUE);
diff --git a/src/lib/elementary/elc_naviframe.c
b/src/lib/elementary/elc_naviframe.c
index 2f506bf..2c5eb10 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -995,7 +995,7 @@ _back_btn_new(Evas_Object *obj, const char *title_label)
if (edje_object_part_exists(ed, CONTENT_PART))
{
Evas_Object *ico = elm_icon_add(btn);
- elm_icon_standard_set(ico, "arrow_left");
+ elm_icon_standard_set(ico, "go-left");
elm_layout_content_set(btn, CONTENT_PART, ico);
}
diff --git a/src/lib/elementary/elm_icon_legacy.h
b/src/lib/elementary/elm_icon_legacy.h
index 21bcf1a..f30d30e 100644
--- a/src/lib/elementary/elm_icon_legacy.h
+++ b/src/lib/elementary/elm_icon_legacy.h
@@ -66,11 +66,10 @@ EAPI Elm_Icon_Lookup_Order elm_icon_order_lookup_get(const
Evas_Object *obj EINA
/**
* @brief Set the icon by icon standards names.
*
- * For example, freedesktop.org defines standard icon names such as "home",
- * "network", etc. There can be different icon sets to match those icon keys.
+ * For example, freedesktop.org defines standard icon names such as "go-home",
+ * "network-wired", etc. There can be different icon sets to match those icon
keys.
* The "name" given as parameter is one of these "keys", and will be used to
- * look in the freedesktop.org paths and elementary theme. One can change the
- * lookup order with @ref elm_icon_order_lookup_set.
+ * look in the freedesktop.org paths and elementary theme.
*
* If name is not found in any of the expected locations and it is the absolute
* path of an image file, this image will be used.
--
