From 89d264272d50a65ae574943b4cec406dfdd64c06 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Tue, 27 Sep 2016 22:06:40 +0100 Subject: [PATCH] Update standard icon naming to use standards These are not exact icons but they seem close enough for elm 1.18+ --- src/bin/controls.c | 20 ++++++++++---------- src/bin/options.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/bin/controls.c b/src/bin/controls.c index c9a62b34..23297afc 100644 --- a/src/bin/controls.c +++ b/src/bin/controls.c @@ -266,27 +266,27 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term, elm_box_pack_end(ct_boxh, o); evas_object_show(o); - o = _button_add(win, _("New"), "new", _cb_ct_new, NULL); + o = _button_add(win, _("New"), "window-new", _cb_ct_new, NULL); elm_box_pack_end(ct_box, o); o = _sep_add_h(win); elm_box_pack_end(ct_box, o); - o = _button_add(win, _("Split V"), "split-h", _cb_ct_split_v, NULL); + o = _button_add(win, _("Split V"), "object-flip-vertical", _cb_ct_split_v, NULL); elm_box_pack_end(ct_box, o); - o = _button_add(win, _("Split H"), "split-v", _cb_ct_split_h, NULL); + o = _button_add(win, _("Split H"), "object-flip-horizontal", _cb_ct_split_h, NULL); elm_box_pack_end(ct_box, o); o = _sep_add_h(win); elm_box_pack_end(ct_box, o); - o = _button_add(win, _("Miniview"), "mini-view", _cb_ct_miniview, NULL); + o = _button_add(win, _("Miniview"), "view-restore", _cb_ct_miniview, NULL); elm_box_pack_end(ct_box, o); o = _sep_add_h(win); elm_box_pack_end(ct_box, o); - o = _button_add(win, _("Set title"), "document-edit", _cb_ct_set_title, NULL); + o = _button_add(win, _("Set title"), "format-text-underline", _cb_ct_set_title, NULL); elm_box_pack_end(ct_box, o); o = _sep_add_v(win); @@ -296,25 +296,25 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term, elm_box_pack_end(ct_boxh, o); evas_object_show(o); - o = _button_add(win, _("Copy"), "copy", _cb_ct_copy, NULL); + o = _button_add(win, _("Copy"), "edit-copy", _cb_ct_copy, NULL); evas_object_data_set(ct_frame, "bt_copy", o); if (!termio_selection_exists(term)) elm_object_disabled_set(o, EINA_TRUE); elm_box_pack_end(ct_box2, o); - o = _button_add(win, _("Paste"), "paste", _cb_ct_paste, NULL); + o = _button_add(win, _("Paste"), "edit-paste", _cb_ct_paste, NULL); elm_box_pack_end(ct_box2, o); o = _sep_add_h(win); elm_box_pack_end(ct_box2, o); - o = _button_add(win, _("Settings"), "settings", _cb_ct_options, NULL); + o = _button_add(win, _("Settings"), "preferences-desktop", _cb_ct_options, NULL); elm_box_pack_end(ct_box2, o); o = _sep_add_h(win); elm_box_pack_end(ct_box2, o); - o = _button_add(win, _("About"), "about", _cb_ct_about, NULL); + o = _button_add(win, _("About"), "help-about", _cb_ct_about, NULL); elm_box_pack_end(ct_box2, o); o = _sep_add_h(win); @@ -324,7 +324,7 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term, elm_box_pack_end(ct_boxv, o); evas_object_show(o); - o = _button_add(win, _("Close Terminal"), "close", _cb_ct_close, NULL); + o = _button_add(win, _("Close Terminal"), "window-close", _cb_ct_close, NULL); elm_box_pack_end(ct_box3, o); evas_object_event_callback_add(ct_frame, EVAS_CALLBACK_DEL, diff --git a/src/bin/options.c b/src/bin/options.c index 43e7a51e..45ac9a82 100644 --- a/src/bin/options.c +++ b/src/bin/options.c @@ -171,7 +171,7 @@ options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term, ITEM_APPEND("preferences-system", _("Behavior"), BEHAVIOR); ITEM_APPEND("preferences-desktop-keyboard-shortcuts", _("Keys"), KEYS); ITEM_APPEND("system-run", _("Helpers"), HELPERS); - ITEM_APPEND("apps", _("Toolkit"), ELM); + ITEM_APPEND("preferences-color", _("Toolkit"), ELM); #undef ITEM_APPEND elm_box_pack_end(op_tbox, o);