enlightenment/ephoto
enlightenment
/
ephoto
7
0
Fork 3
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Ephoto: Use correct icon names from spec. Elementary needs to stop overriding though.

This commit is contained in:
Stephen Houston 2015-06-15 14:10:09 -05:00
parent d5fa0ec306
commit 29e4bb3d1a
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/ephoto_config.c
View File

@ -171,7 +171,7 @@ _add_slideshow_config(Evas_Object *parent, Ephoto *ephoto)
ic = elm_icon_add(hbox);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "stock_save");
elm_icon_standard_set(ic, "document-save");
button = elm_button_add(hbox);
elm_object_text_set(button, "Save");
@ -182,7 +182,7 @@ _add_slideshow_config(Evas_Object *parent, Ephoto *ephoto)
ic = elm_icon_add(hbox);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "stock_close");
elm_icon_standard_set(ic, "window-close");
button = elm_button_add(hbox);
elm_object_text_set(button, "Cancel");
@ -269,7 +269,7 @@ _add_about_config(Evas_Object *parent, Ephoto *ephoto)
ic = elm_icon_add(box);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "stock_close");
elm_icon_standard_set(ic, "window-close");
button = elm_button_add(box);
elm_object_text_set(button, "Close");
@ -328,7 +328,7 @@ ephoto_config_window(Ephoto *ephoto)
slideshow = _add_slideshow_config(pager, ephoto);
sit = elm_naviframe_item_push(pager, NULL, NULL, NULL, slideshow, "overlap");
elm_naviframe_item_title_enabled_set(sit, EINA_FALSE, EINA_FALSE);
elm_toolbar_item_append(toolbar, "stock_media-play", "Slideshow", _show_page, sit);
elm_toolbar_item_append(toolbar, "media-playback-start", "Slideshow", _show_page, sit);
about = _add_about_config(pager, ephoto);
ait = elm_naviframe_item_insert_after(pager, sit, NULL, NULL, NULL, about, "overlap");

18
src/bin/ephoto_single_browser.c
View File

@ -828,7 +828,7 @@ _reset_image(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
ic = elm_icon_add(hbox);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "stock_save");
elm_icon_standard_set(ic, "document-save");
button = elm_button_add(hbox);
elm_object_text_set(button, "Yes");
@ -839,7 +839,7 @@ _reset_image(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
ic = elm_icon_add(hbox);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "stock_close");
elm_icon_standard_set(ic, "window-close");
button = elm_button_add(hbox);
elm_object_text_set(button, "No");
@ -876,7 +876,7 @@ _failed_save(Ephoto_Single_Browser *sb)
ic = elm_icon_add(box);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "stock_close");
elm_icon_standard_set(ic, "window-close");
button = elm_button_add(box);
elm_object_text_set(button, "OK");
@ -958,7 +958,7 @@ _save_image(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUS
ic = elm_icon_add(hbox);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "stock_save");
elm_icon_standard_set(ic, "document-save");
button = elm_button_add(hbox);
elm_object_text_set(button, "Yes");
@ -969,7 +969,7 @@ _save_image(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUS
ic = elm_icon_add(hbox);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "stock_close");
elm_icon_standard_set(ic, "window-close");
button = elm_button_add(hbox);
elm_object_text_set(button, "No");
@ -1062,7 +1062,7 @@ _save_image_as_done(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
ic = elm_icon_add(hbox);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "stock_save");
elm_icon_standard_set(ic, "document-save");
button = elm_button_add(hbox);
elm_object_text_set(button, "Yes");
@ -1073,7 +1073,7 @@ _save_image_as_done(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
ic = elm_icon_add(hbox);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "stock_close");
elm_icon_standard_set(ic, "window-close");
button = elm_button_add(hbox);
elm_object_text_set(button, "No");
@ -1515,8 +1515,8 @@ ephoto_single_browser_add(Ephoto *ephoto, Evas_Object *parent)
//elm_toolbar_item_separator_set(elm_toolbar_item_append(sb->bar, NULL, NULL, NULL, NULL), EINA_TRUE);
icon = elm_toolbar_item_append(sb->bar, "stock_media-play", "Slideshow", _slideshow, sb);
icon = elm_toolbar_item_append(sb->bar, "emblem-system", "Settings", _settings, sb);
icon = elm_toolbar_item_append(sb->bar, "media-playback-start", "Slideshow", _slideshow, sb);
icon = elm_toolbar_item_append(sb->bar, "preferences-system", "Settings", _settings, sb);
elm_box_pack_end(sb->main, sb->bar);
evas_object_show(sb->bar);

10
src/bin/ephoto_thumb_browser.c
View File

@ -89,7 +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_standard_set(ic, "stock_folder");
elm_icon_standard_set(ic, "folder");
return ic;
}
@ -392,8 +392,8 @@ _ephoto_dir_hide_folders(void *data, Evas_Object *obj EINA_UNUSED, void *event_i
min = elm_object_item_widget_get(icon);
evas_object_data_set(max, "min", min);
evas_object_data_set(min, "max", max);
elm_toolbar_item_append(tb->vbar, "stock_media-play", "Slideshow", _slideshow, tb);
elm_toolbar_item_append(tb->vbar, "emblem-system", "Settings", _settings, tb);
elm_toolbar_item_append(tb->vbar, "media-playback-start", "Slideshow", _slideshow, tb);
elm_toolbar_item_append(tb->vbar, "preferences-system", "Settings", _settings, tb);
elm_box_pack_end(tb->bleftbox, tb->vbar);
evas_object_show(tb->vbar);
@ -804,8 +804,8 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent)
min = elm_object_item_widget_get(icon);
evas_object_data_set(max, "min", min);
evas_object_data_set(min, "max", max);
elm_toolbar_item_append(tb->bar, "stock_media-play", "Slideshow", _slideshow, tb);
elm_toolbar_item_append(tb->bar, "emblem-system", "Settings", _settings, tb);
elm_toolbar_item_append(tb->bar, "media-playback-start", "Slideshow", _slideshow, tb);
elm_toolbar_item_append(tb->bar, "preferences-system", "Settings", _settings, tb);
elm_box_pack_end(tb->leftbox, tb->bar);
evas_object_show(tb->bar);