okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=3e3a4308b488b9dda5ea4d3a58b254a4f6053660
commit 3e3a4308b488b9dda5ea4d3a58b254a4f6053660
Author: Stephen Houston <smhousto...@gmail.com>
Date: Mon Aug 10 10:42:02 2015 -0500
Ephoto: Lookup FDO icons first.
---
src/bin/ephoto_config.c | 1 +
src/bin/ephoto_single_browser.c | 1 +
src/bin/ephoto_thumb_browser.c | 7 +++++++
3 files changed, 9 insertions(+)
diff --git a/src/bin/ephoto_config.c b/src/bin/ephoto_config.c
index 97ae33d..44ce11d 100644
--- a/src/bin/ephoto_config.c
+++ b/src/bin/ephoto_config.c
@@ -311,6 +311,7 @@ ephoto_config_window(Ephoto *ephoto)
elm_toolbar_homogeneous_set(toolbar, EINA_TRUE);
elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_SCROLL);
elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_NONE);
+ elm_toolbar_icon_order_lookup_set(toolbar, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_weight_set(toolbar, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(toolbar, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(box, toolbar);
diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index 7c7ae72..c90f1da 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -1480,6 +1480,7 @@ ephoto_single_browser_add(Ephoto *ephoto, Evas_Object
*parent)
elm_toolbar_homogeneous_set(sb->bar, EINA_TRUE);
elm_toolbar_shrink_mode_set(sb->bar, ELM_TOOLBAR_SHRINK_SCROLL);
elm_toolbar_select_mode_set(sb->bar, ELM_OBJECT_SELECT_MODE_NONE);
+ elm_toolbar_icon_order_lookup_set(sb->bar, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_weight_set(sb->bar, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(sb->bar, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c
index 8547980..485711b 100644
--- a/src/bin/ephoto_thumb_browser.c
+++ b/src/bin/ephoto_thumb_browser.c
@@ -89,6 +89,7 @@ _ephoto_dir_item_icon_get(void *data EINA_UNUSED, Evas_Object
*obj, const char *
if (!strcmp(part, "elm.swallow.end"))
return NULL;
Evas_Object *ic = elm_icon_add(obj);
+ elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
elm_icon_standard_set(ic, "folder");
return ic;
}
@@ -382,6 +383,7 @@ _ephoto_dir_hide_folders(void *data, Evas_Object *obj
EINA_UNUSED, void *event_i
elm_toolbar_homogeneous_set(tb->vbar, EINA_TRUE);
elm_toolbar_shrink_mode_set(tb->vbar, ELM_TOOLBAR_SHRINK_NONE);
elm_toolbar_select_mode_set(tb->vbar, ELM_OBJECT_SELECT_MODE_NONE);
+ elm_toolbar_icon_order_lookup_set(tb->vbar, ELM_ICON_LOOKUP_FDO_THEME);
elm_toolbar_align_set(tb->vbar, 0.0);
evas_object_size_hint_weight_set(tb->vbar, 0.0, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(tb->vbar, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -399,6 +401,7 @@ _ephoto_dir_hide_folders(void *data, Evas_Object *obj
EINA_UNUSED, void *event_i
evas_object_show(tb->vbar);
ic = elm_icon_add(tb->bleftbox);
+ elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
elm_icon_standard_set(ic, "go-next");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
but = elm_button_add(tb->bleftbox);
@@ -795,6 +798,7 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object
*parent)
elm_toolbar_homogeneous_set(tb->bar, EINA_TRUE);
elm_toolbar_shrink_mode_set(tb->bar, ELM_TOOLBAR_SHRINK_NONE);
elm_toolbar_select_mode_set(tb->bar, ELM_OBJECT_SELECT_MODE_NONE);
+ elm_toolbar_icon_order_lookup_set(tb->bar, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_weight_set(tb->bar, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(tb->bar, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -827,6 +831,7 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object
*parent)
evas_object_show(hbox);
ic = elm_icon_add(hbox);
+ elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
elm_icon_standard_set(ic, "go-up");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
but = elm_button_add(hbox);
@@ -839,6 +844,7 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object
*parent)
evas_object_show(but);
ic = elm_icon_add(hbox);
+ elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
elm_icon_standard_set(ic, "go-home");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
but = elm_button_add(hbox);
@@ -859,6 +865,7 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object
*parent)
evas_object_show(tb->fsel);
ic = elm_icon_add(hbox);
+ elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
elm_icon_standard_set(ic, "go-previous");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
but = elm_button_add(hbox);
--
