vtorri
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: use standard icon names 

remove deprecated lookup order calls as icon theme is set by user
This commit is contained in:
Andy Williams 2016-04-28 15:51:12 +01:00
parent b8665e1bae
commit 70742e1c73
5 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/edi_filepanel.c
View File

@ -176,7 +176,6 @@ _content_get(void *data, Evas_Object *obj, const char *source)
Evas_Object *ic;
ic = elm_icon_add(obj);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
if (provider)
elm_icon_standard_set(ic, provider->icon);
else
@ -212,7 +211,6 @@ _content_dir_get(void *data EINA_UNUSED, Evas_Object *obj, const char *source)
return NULL;
ic = elm_icon_add(obj);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
elm_icon_standard_set(ic, "folder");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
evas_object_show(ic);
@ -506,7 +504,6 @@ edi_filepanel_add(Evas_Object *parent, Evas_Object *win,
elm_box_pack_end(hbox, clear);
icon = elm_icon_add(clear);
elm_icon_order_lookup_set(icon, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_min_set(icon, 14 * elm_config_scale_get(), 14 * elm_config_scale_get());
elm_icon_standard_set(icon, "edit-clear");
elm_object_part_content_set(clear, "icon", icon);
@ -517,7 +514,6 @@ edi_filepanel_add(Evas_Object *parent, Evas_Object *win,
elm_box_pack_end(hbox, cancel);
icon = elm_icon_add(cancel);
elm_icon_order_lookup_set(icon, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_min_set(icon, 14 * elm_config_scale_get(), 14 * elm_config_scale_get());
elm_icon_standard_set(icon, "window-close");
elm_object_part_content_set(cancel, "icon", icon);

10
src/bin/edi_main.c
View File

@ -855,8 +855,8 @@ _edi_menu_setup(Evas_Object *win)
menu_it = elm_menu_item_add(menu, NULL, NULL, "Build", NULL, NULL);
elm_menu_item_add(menu, menu_it, "system-run", "Build", _edi_menu_build_cb, NULL);
elm_menu_item_add(menu, menu_it, "dialog-ok", "Test", _edi_menu_test_cb, NULL);
elm_menu_item_add(menu, menu_it, "stock_media-play", "Run", _edi_menu_run_cb, NULL);
elm_menu_item_add(menu, menu_it, "media-record", "Test", _edi_menu_test_cb, NULL);
elm_menu_item_add(menu, menu_it, "media-playback-start", "Run", _edi_menu_run_cb, NULL);
elm_menu_item_add(menu, menu_it, "edit-clear", "Clean", _edi_menu_clean_cb, NULL);
menu_it = elm_menu_item_add(menu, NULL, NULL, "Help", NULL, NULL);
@ -883,7 +883,6 @@ edi_toolbar_setup(Evas_Object *win)
elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_SCROLL);
elm_toolbar_select_mode_set(tb, ELM_OBJECT_SELECT_MODE_NONE);
elm_toolbar_align_set(tb, 0.0);
elm_toolbar_icon_order_lookup_set(tb, ELM_ICON_LOOKUP_FDO_THEME);
elm_object_focus_allow_set(tb, EINA_FALSE);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
evas_object_size_hint_weight_set(tb, 0.86, 0.0);
@ -911,8 +910,8 @@ edi_toolbar_setup(Evas_Object *win)
elm_toolbar_item_separator_set(tb_it, EINA_TRUE);
tb_it = elm_toolbar_item_append(tb, "system-run", "Build", _tb_build_cb, NULL);
tb_it = elm_toolbar_item_append(tb, "dialog-ok", "Test", _tb_test_cb, NULL);
tb_it = elm_toolbar_item_append(tb, "stock_media-play", "Run", _tb_run_cb, NULL);
tb_it = elm_toolbar_item_append(tb, "media-record", "Test", _tb_test_cb, NULL);
tb_it = elm_toolbar_item_append(tb, "media-playback-start", "Run", _tb_run_cb, NULL);
tb_it = elm_toolbar_item_append(tb, "edit-clear", "Clean", _tb_clean_cb, NULL);
elm_box_pack_end(box, tb);
@ -923,7 +922,6 @@ edi_toolbar_setup(Evas_Object *win)
elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_SCROLL);
elm_toolbar_select_mode_set(tb, ELM_OBJECT_SELECT_MODE_NONE);
elm_toolbar_align_set(tb, 1.0);
elm_toolbar_icon_order_lookup_set(tb, ELM_ICON_LOOKUP_FDO_THEME);
elm_object_focus_allow_set(tb, EINA_FALSE);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
evas_object_size_hint_weight_set(tb, 0.14, 0.0);

1
src/bin/mainview/edi_mainview.c
View File

@ -705,7 +705,6 @@ edi_mainview_add(Evas_Object *parent, Evas_Object *win)
evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_toolbar_homogeneous_set(tb, EINA_FALSE);
elm_toolbar_icon_order_lookup_set(tb, ELM_ICON_LOOKUP_FDO_THEME);
elm_toolbar_icon_size_set(tb, 20);
elm_object_style_set(tb, "item_horizontal");
elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_MENU);

1
src/bin/screens/edi_settings.c
View File

@ -443,7 +443,6 @@ edi_settings_show(Evas_Object *mainwin)
elm_toolbar_select_mode_set(tb, ELM_OBJECT_SELECT_MODE_ALWAYS);
elm_toolbar_align_set(tb, 0.0);
elm_toolbar_horizontal_set(tb, EINA_FALSE);
elm_toolbar_icon_order_lookup_set(tb, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_weight_set(tb, 0.0, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(tb, 0.0, EVAS_HINT_FILL);
elm_table_pack(table, tb, 0, 0, 1, 5);

1
src/bin/screens/edi_welcome.c
View File

@ -362,7 +362,6 @@ _edi_welcome_add_recent_projects(Evas_Object *box)
// Add an 'edit-delete' icon that can be clicked to remove a project directory
icon_button = elm_button_add(box);
ic = elm_icon_add(icon_button);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_THEME_FDO);
elm_icon_standard_set(ic, "edit-delete");
elm_image_resizable_set(ic, EINA_FALSE, EINA_FALSE);