From 6d070aecd2ccd568ce616a3e0fc847a5b7ec112b Mon Sep 17 00:00:00 2001 From: Alastair Poole Date: Thu, 24 Dec 2020 12:45:16 +0000 Subject: [PATCH] ui: power on and off. --- data/images/meson.build | 1 + data/images/off.png | Bin 0 -> 8475 bytes data/images/on.png | Bin 0 -> 8651 bytes src/bin/ui/ui_process_list.c | 23 +++++++++++------------ src/bin/ui/ui_sensors.c | 24 +++++++++++++++++++++--- 5 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 data/images/off.png create mode 100644 data/images/on.png diff --git a/data/images/meson.build b/data/images/meson.build index 341a13a..68e9aac 100644 --- a/data/images/meson.build +++ b/data/images/meson.build @@ -11,4 +11,5 @@ install_data('go-up.png', 'go-down.png', 'clo.png', 'bolt.png', 'menu.png', 'lovethisdogharvey.png', 'application.png', 'e.png', 'border.png', 'freebsd.png', 'linux.png', + 'on.png', 'off.png', install_dir: join_paths(dir_data, 'evisum/images')) diff --git a/data/images/off.png b/data/images/off.png new file mode 100644 index 0000000000000000000000000000000000000000..3131c8f1545eccc65947108857c7c6f6b0d09bab GIT binary patch literal 8475 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 W<%n0Z0~wS(7i6q&rdO`x7WFU4?XAZE literal 0 HcmV?d00001 diff --git a/data/images/on.png b/data/images/on.png new file mode 100644 index 0000000000000000000000000000000000000000..670223598651718aff6fa5b761d155a182494df2 GIT binary patch literal 8651 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 literal 0 HcmV?d00001 diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c index 643614d..ff58f0a 100644 --- a/src/bin/ui/ui_process_list.c +++ b/src/bin/ui/ui_process_list.c @@ -17,22 +17,20 @@ static Eina_Lock _lock; typedef struct { - Ecore_Thread *thread; - Evisum_Ui_Cache *cache; - Eina_List *cpu_times; - Eina_List *cpu_list; - + Ecore_Thread *thread; + Evisum_Ui_Cache *cache; + Eina_List *cpu_times; + Eina_List *cpu_list; Ecore_Event_Handler *handler[2]; + Evas_Object *win; + Evas_Object *menu; Ui *ui; pid_t selected_pid; char search[16]; int search_len; - Evas_Object *win; - Evas_Object *menu; - Ecore_Timer *timer_search; Evas_Object *entry_pop; Evas_Object *entry; @@ -196,7 +194,8 @@ _sort_by_state(const void *p1, const void *p2) return strcmp(inf1->state, inf2->state); } -typedef struct { +typedef struct +{ pid_t pid; int64_t cpu_time_prev; } pid_cpu_time_t; @@ -1527,9 +1526,9 @@ ui_process_list_win_add(Ui *ui) Ui_Data *pd = _pd = calloc(1, sizeof(Ui_Data)); if (!pd) return; + pd->selected_pid = -1; pd->ui = ui; - pd->handler[0] = ecore_event_handler_add(ELM_EVENT_CONFIG_ALL_CHANGED, _elm_config_changed_cb, pd); pd->handler[1] = ecore_event_handler_add(EVISUM_EVENT_CONFIG_CHANGED, @@ -1546,11 +1545,11 @@ ui_process_list_win_add(Ui *ui) else evas_object_resize(win, EVISUM_WIN_WIDTH * elm_config_scale_get(), EVISUM_WIN_HEIGHT * elm_config_scale_get()); + elm_win_center(win, 1, 1); + obj = _ui_content_system_add(pd, win); pd->cache = evisum_ui_item_cache_new(pd->genlist, _item_create, 50); - elm_win_center(win, EINA_TRUE, EINA_TRUE); evisum_ui_background_add(win, evisum_ui_backgrounds_enabled_get()); - evas_object_show(win); _search_add(pd); diff --git a/src/bin/ui/ui_sensors.c b/src/bin/ui/ui_sensors.c index 531c0c7..246a67e 100644 --- a/src/bin/ui/ui_sensors.c +++ b/src/bin/ui/ui_sensors.c @@ -15,6 +15,7 @@ typedef struct Evas_Object *thermal_pb; + Evas_Object *power_ic; Ui *ui; } Ui_Data; @@ -126,6 +127,15 @@ _sensors_update_feedback_cb(void *data, Ecore_Thread *thread, void *msgdata) elm_object_tooltip_text_set(pd->thermal_pb, pd->sensor->name); } + if (pd->power_ic) + { + if (msg->power.have_ac) + elm_icon_standard_set(pd->power_ic, evisum_icon_path_get("on")); + else + elm_icon_standard_set(pd->power_ic, evisum_icon_path_get("off")); + evas_object_show(pd->power_ic); + } + l = eina_list_nth_list(pd->batteries, 0); while (l && msg->power.battery_count) { @@ -238,6 +248,7 @@ ui_win_sensors_add(Ui *ui) { Evas_Object *win, *content, *bx, *tbl, *fr; Evas_Object *genlist, *pb, *pad; + Evas_Object *ic; Elm_Genlist_Item_Class *itc; power_t power; Evas_Coord x = 0, y = 0; @@ -303,9 +314,16 @@ ui_win_sensors_add(Ui *ui) evas_object_show(pb); bat->pb = pb; - elm_object_content_set(pad, pb); - elm_table_pack(tbl, pad, 0, 0, 1, 1); - elm_box_pack_end(content, tbl); + elm_table_pack(tbl, pb, 1, 0, 1, 1); + if (!i) + { + pd->power_ic = ic = elm_icon_add(win); + evas_object_size_hint_min_set(ic, ELM_SCALE_SIZE(3), ELM_SCALE_SIZE(3)); + evas_object_size_hint_align_set(ic, 0.0, 0.5); + elm_table_pack(tbl, ic, 0, 0, 1, 1); + } + elm_object_content_set(pad, tbl); + elm_box_pack_end(content, pad); pd->batteries = eina_list_append(pd->batteries, bat); }