From 7241ad2da0c4a22b2e6181ccbf80ca6f1edd7cea Mon Sep 17 00:00:00 2001 From: Alastair Poole Date: Mon, 29 Jun 2020 22:23:56 +0100 Subject: [PATCH] ui: menu iconz --- src/bin/ui/ui.c | 12 ++++++-- src/bin/ui/ui_util.c | 68 ++++++++++++++++++++++++++------------------ 2 files changed, 50 insertions(+), 30 deletions(-) diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c index 9e4bc12..c50aebe 100644 --- a/src/bin/ui/ui.c +++ b/src/bin/ui/ui.c @@ -1137,7 +1137,7 @@ static Evas_Object * _ui_content_add(Evas_Object *parent, Ui *ui) { Evas_Object *table, *box, *entry, *hbox, *frame; - Evas_Object *border; + Evas_Object *border, *ic; ui->content = table = elm_table_add(parent); evas_object_size_hint_weight_set(table, EXPAND, EXPAND); @@ -1177,6 +1177,12 @@ _ui_content_add(Evas_Object *parent, Ui *ui) elm_entry_editable_set(entry, EINA_TRUE); evas_object_show(entry); + ic = elm_icon_add(parent); + elm_icon_standard_set(ic, evisum_icon_path_get("find")); + evas_object_size_hint_min_set(ic, 24, 24); + evas_object_show(ic); + elm_object_part_content_set(entry, "icon", ic); + elm_object_content_set(border, entry); elm_box_pack_end(box, border); @@ -1383,7 +1389,7 @@ _menu_setup(Ui *ui) menu = elm_win_main_menu_get(ui->win); menu_it = elm_menu_item_add(menu, NULL, NULL, _("File"), NULL, NULL); - elm_menu_item_add(menu, menu_it, NULL, _("Quit"), _quit_cb, NULL); + elm_menu_item_add(menu, menu_it, "exit", _("Quit"), _quit_cb, NULL); menu_it = elm_menu_item_add(menu, NULL, NULL, _("View"), NULL, NULL); elm_menu_item_add(menu, menu_it, NULL, _("CPU"), _menu_cpu_activity_clicked_cb, ui); elm_menu_item_add(menu, menu_it, NULL, _("Memory"), @@ -1393,7 +1399,7 @@ _menu_setup(Ui *ui) elm_menu_item_add(menu, menu_it, NULL, _("Misc"), _menu_misc_activity_clicked_cb, ui); menu_it = elm_menu_item_add(menu, NULL, NULL, _("Help"), NULL, NULL); - elm_menu_item_add(menu, menu_it, NULL, _("About"), _about_clicked_cb, ui); + elm_menu_item_add(menu, menu_it, "evisum", _("About"), _about_clicked_cb, ui); evas_object_show(menu); } diff --git a/src/bin/ui/ui_util.c b/src/bin/ui/ui_util.c index 1f6b3c0..867f132 100644 --- a/src/bin/ui/ui_util.c +++ b/src/bin/ui/ui_util.c @@ -206,15 +206,16 @@ evisum_child_window_show(Evas_Object *parent, Evas_Object *win) evas_object_show(win); } -static Ecore_Animator *_about_animator = NULL; +static Ecore_Animator *_animator = NULL; typedef struct { int pos; Evas_Object *label; + Evas_Object *version; Evas_Object *bg; -} Animation_Data; +} Animate_Data; -static Animation_Data about; +static Animate_Data about_data; static void _win_del_cb(void *data, Evas_Object *obj, @@ -225,9 +226,9 @@ _win_del_cb(void *data, Evas_Object *obj, win = data; - if (_about_animator) - ecore_animator_del(_about_animator); - _about_animator = NULL; + if (_animator) + ecore_animator_del(_animator); + _animator = NULL; ui = evas_object_data_get(win, "ui"); if (!ui) return; ui->about_visible = EINA_FALSE; @@ -235,17 +236,19 @@ _win_del_cb(void *data, Evas_Object *obj, } static Eina_Bool -anim(void *data) +about_anim(void *data) { - Animation_Data *pd = data; + Animate_Data *ad; Evas_Coord w, h, ow, oh, x; - evas_object_geometry_get(pd->bg, NULL, NULL, &w, &h); - evas_object_geometry_get(pd->label, &x, NULL, &ow, &oh); - evas_object_move(pd->label, x, pd->pos); + ad = data; - pd->pos++; - if (pd->pos >= h) pd->pos = -oh; + evas_object_geometry_get(ad->bg, NULL, NULL, &w, &h); + evas_object_geometry_get(ad->label, &x, NULL, &ow, &oh); + evas_object_move(ad->label, x, ad->pos); + + ad->pos--; + if (ad->pos <= -oh) ad->pos = h; return EINA_TRUE; } @@ -254,13 +257,13 @@ void evisum_about_window_show(void *data) { Ui *ui; - Evas_Object *win, *bg, *box, *label, *btn; + Evas_Object *win, *bg, *box, *version, *label, *btn; const char *copyright = - "Evisum
" - "
" - "Copyright (c) 2018-2020 Alastair Roy Poole " - "

" "" + "" + "Copyright © 2019-2020 Alastair Poole <netstar@gmail.com>
" + "
" + "" "Permission to use, copy, modify, and distribute this software
" "for any purpose with or without fee is hereby granted, provided
" "that the above copyright notice and this permission notice appear
" @@ -274,7 +277,8 @@ evisum_about_window_show(void *data) "FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
" "CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
" "OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
" - "SOFTWARE.
"; + "SOFTWARE.
" + ""; ui = data; @@ -283,8 +287,7 @@ evisum_about_window_show(void *data) ui->about_visible = EINA_TRUE; win = elm_win_add(ui->win, "evisum", ELM_WIN_DIALOG_BASIC); - elm_win_title_set(win, eina_slstr_printf(_("About Evisum %s"), - PACKAGE_VERSION)); + elm_win_title_set(win, "About Evisum"); evas_object_smart_callback_add(win, "delete,request", _win_del_cb, win); evas_object_data_set(win, "ui", ui); @@ -309,18 +312,29 @@ evisum_about_window_show(void *data) evas_object_color_set(label, 255, 255, 255, 255); elm_object_text_set(label, copyright); + version = elm_label_add(win); + evas_object_show(version); + evas_object_color_set(version, 47, 153, 255, 255); + elm_object_text_set(version, + eina_slstr_printf("evisum %s", + PACKAGE_VERSION)); + btn = elm_button_add(win); - evas_object_size_hint_align_set(btn, 0.5, 1.0); + evas_object_size_hint_align_set(btn, 0.5, 0.9); evas_object_size_hint_weight_set(btn, EXPAND, EXPAND); - elm_object_text_set(btn, _("Close")); + evas_object_color_set(btn, 128, 128, 128, 196); + elm_object_text_set(btn, _("Okay!")); + evas_object_show(btn); evas_object_smart_callback_add(btn, "clicked", _win_del_cb, win); - memset(&about, 0, sizeof(Animation_Data)); - about.label = label; - about.bg = bg; - _about_animator = ecore_animator_add(anim, &about); + memset(&about_data, 0, sizeof(Animate_Data)); + about_data.bg = bg; + about_data.label = label; + about_data.version = version; + _animator = ecore_animator_add(about_anim, &about_data); + elm_box_pack_end(box, version); elm_box_pack_end(box, label); elm_box_pack_end(box, btn); elm_object_content_set(win, box);