okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=1f6baaf283a77e1140015506e7cd22b4610d4763
commit 1f6baaf283a77e1140015506e7cd22b4610d4763 Author: Stephen 'Okra' Houston <[email protected]> Date: Thu Feb 9 16:22:22 2017 -0600 Cpumonitor: Add a similar popup to memusage. --- src/modules/sysinfo/batman/batman.c | 2 +- src/modules/sysinfo/cpumonitor/cpumonitor.c | 29 +++++++++++++++++++---------- src/modules/sysinfo/sysinfo.h | 3 ++- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/modules/sysinfo/batman/batman.c b/src/modules/sysinfo/batman/batman.c index dc17cb1..9ecf7e6 100644 --- a/src/modules/sysinfo/batman/batman.c +++ b/src/modules/sysinfo/batman/batman.c @@ -91,7 +91,7 @@ _batman_popup_create(Instance *inst) E_EXPAND(frame); E_FILL(frame); if (inst->cfg->batman.have_power && (inst->cfg->batman.full < 100)) elm_object_text_set(frame, _("Battery Charging")); - else if (inst->cfg->batman.have_power && (inst->cfg->batman.full == 100)) + else if (inst->cfg->batman.full >= 100) elm_object_text_set(frame, _("Battery Fully Charged")); else { diff --git a/src/modules/sysinfo/cpumonitor/cpumonitor.c b/src/modules/sysinfo/cpumonitor/cpumonitor.c index 8860424..38f8995 100644 --- a/src/modules/sysinfo/cpumonitor/cpumonitor.c +++ b/src/modules/sysinfo/cpumonitor/cpumonitor.c @@ -29,8 +29,9 @@ _cpumonitor_face_update(Instance *inst) if (inst->cfg->cpumonitor.popup) { char text[4096]; - snprintf(text, sizeof(text), "%s: %d%%", _("Total CPU Usage"), inst->cfg->cpumonitor.percent); - elm_object_text_set(inst->cfg->cpumonitor.popup_label, text); + snprintf(text, sizeof(text), "%s (%d%%)", _("Total CPU Usage"), inst->cfg->cpumonitor.percent); + elm_object_text_set(inst->cfg->cpumonitor.popup_frame, text); + elm_progressbar_value_set(inst->cfg->cpumonitor.popup_pbar, (float)inst->cfg->cpumonitor.percent / 100); } } @@ -62,7 +63,7 @@ _cpumonitor_popup_deleted(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA static void _cpumonitor_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_data) { - Evas_Object *label, *popup; + Evas_Object *popup, *frame, *pbar; Evas_Event_Mouse_Down *ev = event_data; Instance *inst = data; char text[4096]; @@ -81,13 +82,21 @@ _cpumonitor_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA evas_object_smart_callback_add(popup, "dismissed", _cpumonitor_popup_dismissed, inst); evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, _cpumonitor_popup_deleted, inst); - snprintf(text, sizeof(text), "%s: %d%%", _("Total CPU Usage"), inst->cfg->cpumonitor.percent); - label = elm_label_add(popup); - elm_object_style_set(label, "marker"); - elm_object_text_set(label, text); - elm_object_content_set(popup, label); - evas_object_show(label); - inst->cfg->cpumonitor.popup_label = label; + frame = elm_frame_add(popup); + E_EXPAND(frame); E_FILL(frame); + snprintf(text, sizeof(text), "%s (%d%%)", _("Total CPU Usage"), inst->cfg->cpumonitor.percent); + elm_object_text_set(frame, text); + elm_object_content_set(popup, frame); + evas_object_show(frame); + inst->cfg->cpumonitor.popup_frame = frame; + + pbar = elm_progressbar_add(frame); + E_EXPAND(pbar); E_FILL(pbar); + elm_progressbar_span_size_set(pbar, 200 * e_scale); + elm_progressbar_value_set(pbar, (float)inst->cfg->cpumonitor.percent / 100); + elm_object_content_set(frame, pbar); + evas_object_show(pbar); + inst->cfg->cpumonitor.popup_pbar = pbar; e_gadget_util_ctxpopup_place(inst->o_main, popup, inst->cfg->cpumonitor.o_gadget); diff --git a/src/modules/sysinfo/sysinfo.h b/src/modules/sysinfo/sysinfo.h index 4fccb2e..70da7cf 100644 --- a/src/modules/sysinfo/sysinfo.h +++ b/src/modules/sysinfo/sysinfo.h @@ -187,7 +187,8 @@ struct _Config_Item { Evas_Object *o_gadget; Evas_Object *popup; - Evas_Object *popup_label; + Evas_Object *popup_frame; + Evas_Object *popup_pbar; Evas_Object *configure; int poll_interval; int percent; --
