diff --git a/src/modules/Makefile_sysinfo.mk b/src/modules/Makefile_sysinfo.mk index 5d03162c7..ae2a95098 100644 --- a/src/modules/Makefile_sysinfo.mk +++ b/src/modules/Makefile_sysinfo.mk @@ -17,6 +17,7 @@ src_modules_sysinfo_module_la_SOURCES = src/modules/sysinfo/mod.c \ src/modules/sysinfo/batman/batman.h \ src/modules/sysinfo/batman/batman.c \ src/modules/sysinfo/batman/batman_fallback.c \ + src/modules/sysinfo/batman/batman_config.c \ src/modules/sysinfo/thermal/thermal.h \ src/modules/sysinfo/thermal/thermal.c \ src/modules/sysinfo/thermal/thermal_fallback.c \ diff --git a/src/modules/sysinfo/batman/batman.c b/src/modules/sysinfo/batman/batman.c index be6d7e0a7..d201ae3e2 100644 --- a/src/modules/sysinfo/batman/batman.c +++ b/src/modules/sysinfo/batman/batman.c @@ -10,6 +10,8 @@ static void _batman_cb_warning_popup_hide(void *data, Evas *e, Evas_Object static void _batman_warning_popup_destroy(Instance *inst); static void _batman_warning_popup(Instance *inst, int time, double percent); +static Ecore_Event_Handler *_handler = NULL; + Eina_List * _batman_battery_find(const char *udi) { @@ -114,6 +116,16 @@ _batman_popup_create(Instance *inst) return popup; } +static Evas_Object * +_batman_configure_cb(Evas_Object *g) +{ + Instance *inst = evas_object_data_get(g, "Instance"); + + if (!sysinfo_config) return NULL; + if (inst->cfg->batman.popup) return NULL; + return batman_configure(inst); +} + static void _batman_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_data) { @@ -133,6 +145,41 @@ _batman_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNU inst->cfg->batman.popup = _batman_popup_create(inst); } } + else + { + if (inst->cfg->batman.popup) + { + elm_ctxpopup_dismiss(inst->cfg->batman.popup); + inst->cfg->batman.popup = NULL; + } + if (!sysinfo_config) return; + ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; + if (inst->cfg->esm != E_SYSINFO_MODULE_BATMAN) + batman_configure(inst); + else + e_gadget_configure(inst->o_main); + } +} + +static Eina_Bool +_powersave_cb_config_update(void *data, int type EINA_UNUSED, void *event EINA_UNUSED) +{ + Instance *inst = data; + + if (!inst->cfg->batman.have_battery) + e_powersave_mode_set(E_POWERSAVE_MODE_LOW); + else + { + if (inst->cfg->batman.have_power) + e_powersave_mode_set(E_POWERSAVE_MODE_LOW); + else if (inst->cfg->batman.full > 95) + e_powersave_mode_set(E_POWERSAVE_MODE_MEDIUM); + else if (inst->cfg->batman.full > 30) + e_powersave_mode_set(E_POWERSAVE_MODE_HIGH); + else + e_powersave_mode_set(E_POWERSAVE_MODE_EXTREME); + } + return ECORE_CALLBACK_RENEW; } void @@ -386,6 +433,12 @@ _batman_warning_popup(Instance *inst, int t, double percent) if ((!inst) || (inst->warning)) return; + hrs = (t / 3600); + mins = ((t) / 60 - (hrs * 60)); + if (mins < 0) mins = 0; + snprintf(buf, 4096, _("AC power is recommended. %i:%02i Remaining"), hrs, mins); + + if (inst->cfg->batman.desktop_notifications) { E_Notification_Notify n; @@ -394,12 +447,6 @@ _batman_warning_popup(Instance *inst, int t, double percent) n.replaces_id = 0; n.icon.icon = "battery-low"; n.summary = _("Your battery is low!"); - - hrs = (t / 3600); - mins = ((t) / 60 - (hrs * 60)); - if (mins < 0) mins = 0; - snprintf(buf, 4096, _("AC power is recommended. %i:%02i Remaining"), hrs, mins); - n.body = buf; n.timeout = inst->cfg->batman.alert_timeout * 1000; e_notification_client_send(&n, _batman_warning_popup_cb, inst); @@ -432,8 +479,7 @@ _batman_warning_popup(Instance *inst, int t, double percent) elm_layout_text_set(popup_bg, "e.text.title", _("Your battery is low!")); - elm_layout_text_set(popup_bg, "e.text.label", - _("AC power is recommended.")); + elm_layout_text_set(popup_bg, "e.text.label", buf); evas_object_show(inst->popup_battery); evas_object_show(popup_bg); @@ -477,7 +523,12 @@ _batman_removed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_data) Instance *inst = data; if (inst->o_main != event_data) return; - + if (_handler) + ecore_event_handler_del(_handler); + if (inst->cfg->batman.popup) + E_FREE_FUNC(inst->cfg->batman.popup, evas_object_del); + if (inst->cfg->batman.configure) + E_FREE_FUNC(inst->cfg->batman.configure, evas_object_del); #if defined(HAVE_EEZE) _batman_udev_stop(inst); #elif defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) @@ -502,6 +553,11 @@ void sysinfo_batman_remove(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_data EINA_UNUSED) { Instance *inst = data; + + if (inst->cfg->batman.popup) + E_FREE_FUNC(inst->cfg->batman.popup, evas_object_del); + if (inst->cfg->batman.configure) + E_FREE_FUNC(inst->cfg->batman.configure, evas_object_del); #ifdef HAVE_EEZE _batman_udev_stop(inst); #elif defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) @@ -525,6 +581,8 @@ _batman_created_cb(void *data, Evas_Object *obj, void *event_data EINA_UNUSED) { Instance *inst = data; + e_gadget_configure_cb_set(inst->o_main, _batman_configure_cb); + inst->cfg->batman.full = -2; inst->cfg->batman.time_left = -2; inst->cfg->batman.have_battery = -2; @@ -540,6 +598,8 @@ _batman_created_cb(void *data, Evas_Object *obj, void *event_data EINA_UNUSED) EVAS_CALLBACK_MOUSE_DOWN, _batman_mouse_down_cb, inst); evas_object_event_callback_add(inst->cfg->batman.o_gadget, EVAS_CALLBACK_RESIZE, _batman_resize_cb, inst); + _handler = ecore_event_handler_add(E_EVENT_POWERSAVE_CONFIG_UPDATE, + _powersave_cb_config_update, inst); evas_object_show(inst->cfg->batman.o_gadget); evas_object_smart_callback_del_full(obj, "gadget_created", _batman_created_cb, data); _batman_config_updated(inst); @@ -562,6 +622,8 @@ sysinfo_batman_create(Evas_Object *parent, Instance *inst) EVAS_CALLBACK_MOUSE_DOWN, _batman_mouse_down_cb, inst); evas_object_event_callback_add(inst->cfg->batman.o_gadget, EVAS_CALLBACK_RESIZE, _batman_resize_cb, inst); + _handler = ecore_event_handler_add(E_EVENT_POWERSAVE_CONFIG_UPDATE, + _powersave_cb_config_update, inst); evas_object_show(inst->cfg->batman.o_gadget); _batman_config_updated(inst); @@ -602,6 +664,7 @@ _conf_item_get(int *id) ci->batman.fuzzy = 0; #endif ci->batman.desktop_notifications = 0; + ci->batman.configure = NULL; sysinfo_config->items = eina_list_append(sysinfo_config->items, ci); @@ -618,6 +681,7 @@ batman_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient EINA_UNU *id = inst->cfg->id; inst->o_main = elm_box_add(parent); E_EXPAND(inst->o_main); + evas_object_data_set(inst->o_main, "Instance", inst); evas_object_smart_callback_add(parent, "gadget_created", _batman_created_cb, inst); evas_object_smart_callback_add(parent, "gadget_removed", _batman_removed_cb, inst); evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_DEL, sysinfo_batman_remove, inst); diff --git a/src/modules/sysinfo/batman/batman.h b/src/modules/sysinfo/batman/batman.h index 8d13f2b50..2564f58ba 100644 --- a/src/modules/sysinfo/batman/batman.h +++ b/src/modules/sysinfo/batman/batman.h @@ -21,7 +21,7 @@ typedef struct _Battery Battery; typedef struct _Ac_Adapter Ac_Adapter; -typedef struct _Battery_Config Battery_Config; +typedef struct _Batman_Config Batman_Config; struct _Battery { @@ -77,6 +77,16 @@ struct _Ac_Adapter int * mib; }; +struct _Batman_Config +{ + Instance *inst; + Evas_Object *alert_check; + Evas_Object *alert_desktop; + Evas_Object *alert_time; + Evas_Object *alert_percent; + Evas_Object *alert_timeout; +}; + Eina_List *_batman_battery_find(const char *udi); Eina_List *_batman_ac_adapter_find(const char *udi); void _batman_update(Instance *inst, int full, int time_left, Eina_Bool have_battery, Eina_Bool have_power); @@ -102,6 +112,7 @@ void _batman_sysctl_stop(void); /* end batman_sysctl.c */ #endif +Evas_Object *batman_configure(Instance *inst); void _batman_config_updated(Instance *inst); #endif diff --git a/src/modules/sysinfo/batman/batman_config.c b/src/modules/sysinfo/batman/batman_config.c new file mode 100644 index 000000000..7573dd04f --- /dev/null +++ b/src/modules/sysinfo/batman/batman_config.c @@ -0,0 +1,510 @@ +#include "batman.h" + +static void +_config_close(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + Batman_Config *bc = data; + Instance *inst = bc->inst; + + E_FREE_FUNC(inst->cfg->batman.configure, evas_object_del); + E_FREE_FUNC(bc, free); + e_config_save_queue(); +} + +static void +_update_suspend_percent(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) +{ + Batman_Config *bc = data; + Instance *inst = bc->inst; + int value = elm_slider_value_get(obj); + + inst->cfg->batman.suspend_below = value; + e_config_save_queue(); + _batman_config_updated(inst); +} + +static void +_update_alert_time(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + Batman_Config *bc = data; + Instance *inst = bc->inst; + int value = elm_slider_value_get(bc->alert_time); + + inst->cfg->batman.alert = value; + e_config_save_queue(); + _batman_config_updated(inst); +} + +static void +_update_alert_percent(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + Batman_Config *bc = data; + Instance *inst = bc->inst; + int value = elm_slider_value_get(bc->alert_percent); + + inst->cfg->batman.alert_p = value; + e_config_save_queue(); + _batman_config_updated(inst); +} + +static void +_update_alert_timeout(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + Batman_Config *bc = data; + Instance *inst = bc->inst; + int value = elm_slider_value_get(bc->alert_timeout); + + inst->cfg->batman.alert_timeout = value; + e_config_save_queue(); + _batman_config_updated(inst); +} + +static void +_check_desktop_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + Batman_Config *bc = data; + Instance *inst = bc->inst; + + inst->cfg->batman.desktop_notifications = elm_check_state_get(bc->alert_desktop); + e_config_save_queue(); + _batman_config_updated(inst); +} + +static void +_check_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + Batman_Config *bc = data; + Instance *inst = bc->inst; + + if (!elm_check_state_get(bc->alert_check)) + { + elm_object_disabled_set(bc->alert_time, EINA_TRUE); + elm_object_disabled_set(bc->alert_percent, EINA_TRUE); + elm_object_disabled_set(bc->alert_desktop, EINA_TRUE); + elm_object_disabled_set(bc->alert_timeout, EINA_TRUE); + elm_slider_value_set(bc->alert_time, 0); + elm_slider_value_set(bc->alert_percent, 0); + _update_alert_time(bc, NULL, NULL); + _update_alert_percent(bc, NULL, NULL); + } + else + { + elm_object_disabled_set(bc->alert_time, EINA_FALSE); + elm_object_disabled_set(bc->alert_percent, EINA_FALSE); + elm_object_disabled_set(bc->alert_desktop, EINA_FALSE); + elm_object_disabled_set(bc->alert_timeout, EINA_FALSE); + } + e_config_save_queue(); + _batman_config_updated(inst); +} + +static void +_suspend_changed(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) +{ + Batman_Config *bc = data; + Instance *inst = bc->inst; + int value = elm_radio_value_get(obj); + + switch (value) + { + case 0: + inst->cfg->batman.suspend_method = SUSPEND; + break; + case 1: + inst->cfg->batman.suspend_method = HIBERNATE; + break; + case 2: + inst->cfg->batman.suspend_method = SHUTDOWN; + break; + default: + inst->cfg->batman.suspend_method = SUSPEND; + } + + e_config_save_queue(); + _batman_config_updated(inst); +} + +static void +_poll_changed(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) +{ + Batman_Config *bc = data; + Instance *inst = bc->inst; + int value = elm_radio_value_get(obj); + + switch (value) + { + case 0: + inst->cfg->batman.poll_interval = 4; + break; + case 1: + inst->cfg->batman.poll_interval = 8; + break; + case 2: + inst->cfg->batman.poll_interval = 32; + break; + case 3: + inst->cfg->batman.poll_interval = 64; + break; + case 4: + inst->cfg->batman.poll_interval = 256; + break; + default: + inst->cfg->batman.poll_interval = 32; + } + + e_config_save_queue(); + _batman_config_updated(inst); +} + +static void +_power_management_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_data EINA_UNUSED) +{ + Evas_Object *popup = data; + + evas_object_del(popup); + e_configure_registry_call("advanced/powermanagement", NULL, NULL); +} + +static void +_icon_theme_file_set(Evas_Object *img, const char *icon) +{ + const char *path = NULL, *k = NULL; + char buf[4096]; + int len = 0; + + if (!icon) + path = NULL; + else if (strncmp(icon, "/", 1) && !ecore_file_exists(icon)) + { + path = efreet_icon_path_find(e_config->icon_theme, icon, 48); + if (!path) + { + if (e_util_strcmp(e_config->icon_theme, "hicolor")) + path = efreet_icon_path_find("hicolor", icon, 48); + } + } + else if (ecore_file_exists(icon)) + { + path = icon; + } + if (!path) + { + snprintf(buf, sizeof(buf), "e/icons/%s", icon); + if (eina_list_count(e_theme_collection_items_find("base/theme/icons", buf))) + { + path = e_theme_edje_file_get("base/theme/icons", buf); + k = buf; + } + else + { + path = e_theme_edje_file_get("base/theme/icons", "e/icons/unknown"); + k = "e/icons/unknown"; + } + } + if (path && icon) + { + len = strlen(icon); + if ((len > 4) && (!strcasecmp(icon + len - 4, ".edj"))) + k = "icon"; + } + elm_image_file_set(img, path, k); +} + +Evas_Object * +batman_configure(Instance *inst) +{ + Evas_Object *popup, *frame, *main_box, *box, *o, *group, *groupy, *lbl; + Evas_Object *slider, *check, *but, *img; + Eina_Bool show_alert; + E_Zone *zone = e_zone_current_get(); + Batman_Config *bc = E_NEW(Batman_Config, 1); + + bc->inst = inst; + + if (inst->cfg->batman.alert > 0 || inst->cfg->batman.alert_p > 0) + show_alert = EINA_TRUE; + else + show_alert = EINA_FALSE; + + popup = elm_popup_add(e_comp->elm); + E_EXPAND(popup); + elm_popup_allow_events_set(popup, 1); + elm_popup_scrollable_set(popup, 1); + + main_box = elm_box_add(popup); + elm_box_horizontal_set(main_box, EINA_FALSE); + E_EXPAND(main_box); + E_FILL(main_box); + evas_object_show(main_box); + elm_object_content_set(popup, main_box); + + lbl = elm_label_add(main_box); + evas_object_size_hint_weight_set(lbl, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(lbl, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_object_style_set(lbl, "marker"); + elm_object_text_set(lbl, _("Batman Configuration")); + elm_box_pack_end(main_box, lbl); + evas_object_show(lbl); + + frame = elm_frame_add(main_box); + elm_object_text_set(frame, _("Update Poll Interval")); + E_EXPAND(frame); + E_FILL(frame); + elm_box_pack_end(main_box, frame); + evas_object_show(frame); + + box = elm_box_add(frame); + elm_box_horizontal_set(box, EINA_FALSE); + E_EXPAND(box); + evas_object_show(box); + + o = elm_radio_add(box); + elm_radio_state_value_set(o, 0); + E_EXPAND(o); + E_ALIGN(o, 0, 0); + elm_object_text_set(o, _("Fast (4 ticks)")); + elm_box_pack_end(box, o); + evas_object_smart_callback_add(o, "changed", _poll_changed, bc); + evas_object_show(o); + group = o; + + o = elm_radio_add(box); + elm_radio_state_value_set(o, 1); + elm_radio_group_add(o, group); + E_EXPAND(o); + E_ALIGN(o, 0, 0); + elm_object_text_set(o, _("Medium (8 ticks)")); + elm_box_pack_end(box, o); + evas_object_smart_callback_add(o, "changed", _poll_changed, bc); + evas_object_show(o); + + o = elm_radio_add(box); + elm_radio_state_value_set(o, 2); + elm_radio_group_add(o, group); + E_EXPAND(o); + E_ALIGN(o, 0, 0); + elm_object_text_set(o, _("Normal (32 ticks)")); + elm_box_pack_end(box, o); + evas_object_smart_callback_add(o, "changed", _poll_changed, bc); + evas_object_show(o); + + o = elm_radio_add(box); + elm_radio_state_value_set(o, 3); + elm_radio_group_add(o, group); + E_ALIGN(o, 0, 0); + elm_object_text_set(o, _("Slow (64 ticks)")); + elm_box_pack_end(box, o); + evas_object_smart_callback_add(o, "changed", _poll_changed, bc); + evas_object_show(o); + + o = elm_radio_add(box); + elm_radio_state_value_set(o, 4); + elm_radio_group_add(o, group); + E_EXPAND(o); + E_ALIGN(o, 0, 0); + elm_object_text_set(o, _("Very Slow (256 ticks)")); + elm_box_pack_end(box, o); + evas_object_smart_callback_add(o, "changed", _poll_changed, bc); + evas_object_show(o); + + switch(inst->cfg->batman.poll_interval) + { + case 4: + elm_radio_value_set(group, 0); + break; + case 8: + elm_radio_value_set(group, 1); + break; + case 32: + elm_radio_value_set(group, 2); + break; + case 64: + elm_radio_value_set(group, 3); + break; + case 256: + elm_radio_value_set(group, 4); + break; + default: + elm_radio_value_set(group, 2); + } + + elm_object_content_set(frame, box); + + frame = elm_frame_add(main_box); + elm_object_text_set(frame, _("Alert")); + E_EXPAND(frame); + E_FILL(frame); + elm_box_pack_end(main_box, frame); + evas_object_show(frame); + + box = elm_box_add(frame); + elm_box_horizontal_set(box, EINA_FALSE); + E_EXPAND(box); + evas_object_show(box); + + check = elm_check_add(box); + elm_object_text_set(check, _("Show low battery alert")); + elm_check_state_set(check, show_alert); + evas_object_size_hint_align_set(check, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, 0.0); + evas_object_smart_callback_add(check, "changed", _check_changed, bc); + elm_box_pack_end(box, check); + evas_object_show(check); + bc->alert_check = check; + + check = elm_check_add(box); + elm_object_text_set(check, _("Show alert as a desktop notification")); + elm_check_state_set(check, inst->cfg->batman.desktop_notifications); + evas_object_size_hint_align_set(check, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, 0.0); + evas_object_smart_callback_add(check, "changed", _check_desktop_changed, bc); + elm_object_disabled_set(check, !show_alert); + elm_box_pack_end(box, check); + evas_object_show(check); + bc->alert_desktop = check; + + slider = elm_slider_add(box); + elm_object_text_set(slider, _("Alert when time left is at:")); + elm_slider_unit_format_set(slider, "%1.0f min"); + elm_slider_indicator_format_set(slider, "%1.0f min"); + elm_slider_min_max_set(slider, 0, 60); + elm_slider_value_set(slider, inst->cfg->batman.alert); + elm_slider_step_set(slider, 1); + elm_slider_span_size_set(slider, 100); + evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, 0.0); + evas_object_smart_callback_add(slider, "delay,changed", _update_alert_time, bc); + elm_object_disabled_set(slider, !show_alert); + elm_box_pack_end(box, slider); + evas_object_show(slider); + bc->alert_time = slider; + + slider = elm_slider_add(box); + elm_object_text_set(slider, _("Alert when percent left is at:")); + elm_slider_unit_format_set(slider, "%1.0f %%"); + elm_slider_indicator_format_set(slider, "%1.0f %%"); + elm_slider_min_max_set(slider, 0, 100); + elm_slider_value_set(slider, inst->cfg->batman.alert_p); + elm_slider_step_set(slider, 1); + elm_slider_span_size_set(slider, 100); + evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, 0.0); + evas_object_smart_callback_add(slider, "delay,changed", _update_alert_percent, bc); + elm_object_disabled_set(slider, !show_alert); + elm_box_pack_end(box, slider); + evas_object_show(slider); + bc->alert_percent = slider; + + slider = elm_slider_add(box); + elm_object_text_set(slider, _("Alert timeout:")); + elm_slider_unit_format_set(slider, "%1.0f s"); + elm_slider_indicator_format_set(slider, "%1.0f s"); + elm_slider_min_max_set(slider, 1, 300); + elm_slider_value_set(slider, inst->cfg->batman.alert_timeout); + elm_slider_step_set(slider, 1); + elm_slider_span_size_set(slider, 100); + evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, 0.0); + evas_object_smart_callback_add(slider, "delay,changed", _update_alert_timeout, bc); + elm_box_pack_end(box, slider); + evas_object_show(slider); + bc->alert_timeout = slider; + + elm_object_content_set(frame, box); + + frame = elm_frame_add(main_box); + elm_object_text_set(frame, _("Power Management")); + E_EXPAND(frame); + E_FILL(frame); + elm_box_pack_end(main_box, frame); + evas_object_show(frame); + + box = elm_box_add(frame); + elm_box_horizontal_set(box, EINA_FALSE); + E_EXPAND(box); + evas_object_show(box); + + o = elm_radio_add(box); + elm_radio_state_value_set(o, 0); + E_EXPAND(o); + E_ALIGN(o, 0, 0); + elm_object_text_set(o, _("Suspend when below:")); + elm_box_pack_end(box, o); + evas_object_smart_callback_add(o, "changed", _suspend_changed, bc); + evas_object_show(o); + groupy = o; + + o = elm_radio_add(box); + elm_radio_state_value_set(o, 1); + elm_radio_group_add(o, groupy); + E_ALIGN(o, 0, 0); + elm_object_text_set(o, _("Hibernate when below:")); + elm_box_pack_end(box, o); + evas_object_smart_callback_add(o, "changed", _suspend_changed, bc); + evas_object_show(o); + + o = elm_radio_add(box); + elm_radio_state_value_set(o, 2); + elm_radio_group_add(o, groupy); + E_EXPAND(o); + E_ALIGN(o, 0, 0); + elm_object_text_set(o, _("Shutdown when below:")); + elm_box_pack_end(box, o); + evas_object_smart_callback_add(o, "changed", _suspend_changed, bc); + evas_object_show(o); + + switch(inst->cfg->batman.suspend_method) + { + case SUSPEND: + elm_radio_value_set(groupy, 0); + break; + case HIBERNATE: + elm_radio_value_set(groupy, 1); + break; + case SHUTDOWN: + elm_radio_value_set(groupy, 2); + break; + default: + elm_radio_value_set(groupy, 0); + } + + slider = elm_slider_add(box); + elm_slider_unit_format_set(slider, "%1.0f %%"); + elm_slider_indicator_format_set(slider, "%1.0f %%"); + elm_slider_min_max_set(slider, 0, 100); + elm_slider_value_set(slider, inst->cfg->batman.suspend_below); + elm_slider_step_set(slider, 1); + elm_slider_span_size_set(slider, 100); + evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, 0.0); + evas_object_smart_callback_add(slider, "delay,changed", _update_suspend_percent, bc); + elm_box_pack_end(box, slider); + evas_object_show(slider); + + img = elm_icon_add(box); + evas_object_size_hint_aspect_set(img, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); + _icon_theme_file_set(img, "preferences-system-power-management"); + evas_object_show(img); + + but = elm_button_add(box); + elm_object_part_content_set(but, "icon", img); + elm_object_text_set(but, _("Power Management Timing")); + E_EXPAND(but); + evas_object_size_hint_align_set(but, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_data_set(but, "popup", popup); + evas_object_smart_callback_add(but, "clicked", _power_management_cb, popup); + elm_box_pack_end(box, but); + evas_object_show(but); + + elm_object_content_set(frame, box); + popup = e_comp_object_util_add(popup, E_COMP_OBJECT_TYPE_NONE); + evas_object_layer_set(popup, E_LAYER_POPUP); + evas_object_resize(popup, zone->w / 4, zone->h / 3); + e_comp_object_util_center_on_zone(popup, zone); + evas_object_show(popup); + e_comp_object_util_autoclose(popup, NULL, e_comp_object_util_autoclose_on_escape, NULL); + evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, _config_close, bc); + + return inst->cfg->batman.configure = popup; +} + diff --git a/src/modules/sysinfo/mod.c b/src/modules/sysinfo/mod.c index fe16c5636..ff9ffb651 100644 --- a/src/modules/sysinfo/mod.c +++ b/src/modules/sysinfo/mod.c @@ -1,6 +1,6 @@ #include "sysinfo.h" -#define CONFIG_VERSION 1 +#define CONFIG_VERSION 2 static E_Config_DD *conf_edd = NULL; static E_Config_DD *conf_item_edd = NULL; @@ -27,6 +27,7 @@ sysinfo_init(void) E_CONFIG_VAL(D, T, batman.alert_p, INT); E_CONFIG_VAL(D, T, batman.alert_timeout, INT); E_CONFIG_VAL(D, T, batman.suspend_below, INT); + E_CONFIG_VAL(D, T, batman.suspend_method, INT); E_CONFIG_VAL(D, T, batman.force_mode, INT); #if defined HAVE_EEZE || defined __OpenBSD__ || defined __NetBSD__ E_CONFIG_VAL(D, T, batman.fuzzy, INT); @@ -76,6 +77,7 @@ sysinfo_init(void) ci->batman.alert_p = 10; ci->batman.alert_timeout = 0; ci->batman.suspend_below = 0; + ci->batman.suspend_method = 0; ci->batman.force_mode = 0; ci->batman.full = -2; ci->batman.time_left = -2; @@ -85,6 +87,8 @@ sysinfo_init(void) ci->batman.fuzzy = 0; #endif ci->batman.desktop_notifications = 0; + ci->batman.popup = NULL; + ci->batman.configure = NULL; ci->thermal.poll_interval = 128; ci->thermal.low = 30; ci->thermal.high = 80; diff --git a/src/modules/sysinfo/netstatus/netstatus_config.c b/src/modules/sysinfo/netstatus/netstatus_config.c index 0edcb0e2f..12d404b00 100644 --- a/src/modules/sysinfo/netstatus/netstatus_config.c +++ b/src/modules/sysinfo/netstatus/netstatus_config.c @@ -146,7 +146,7 @@ _check_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_U elm_object_disabled_set(nc->receive_max, EINA_FALSE); elm_object_disabled_set(nc->receive_units, EINA_FALSE); elm_object_disabled_set(nc->send_max, EINA_FALSE); - elm_object_disabled_set(nc->send_units, EINA_FALSE);\ + elm_object_disabled_set(nc->send_units, EINA_FALSE); inst->cfg->netstatus.automax = EINA_FALSE; _update_receive_maximums(nc, NULL, NULL); _update_send_maximums(nc, NULL, NULL); diff --git a/src/modules/sysinfo/sysinfo.c b/src/modules/sysinfo/sysinfo.c index 421e76081..438548d37 100644 --- a/src/modules/sysinfo/sysinfo.c +++ b/src/modules/sysinfo/sysinfo.c @@ -96,6 +96,8 @@ _conf_item_get(int *id) ci->batman.fuzzy = 0; #endif ci->batman.desktop_notifications = 0; + ci->batman.popup = NULL; + ci->batman.configure = NULL; ci->thermal.poll_interval = 128; ci->thermal.low = 30; ci->thermal.high = 80; diff --git a/src/modules/sysinfo/sysinfo.h b/src/modules/sysinfo/sysinfo.h index a53ae50b3..4fccb2e3e 100644 --- a/src/modules/sysinfo/sysinfo.h +++ b/src/modules/sysinfo/sysinfo.h @@ -127,6 +127,7 @@ struct _Config_Item { Evas_Object *o_gadget; Evas_Object *popup; + Evas_Object *configure; /* saved * loaded config values */ int poll_interval; int alert; /* Alert on minutes remaining */ @@ -136,9 +137,6 @@ struct _Config_Item int suspend_method; /* Method used to suspend the machine */ int force_mode; /* force use of batget or hal */ /* just config state */ - Ecore_Exe *batget_exe; - Ecore_Event_Handler *batget_data_handler; - Ecore_Event_Handler *batget_del_handler; Ecore_Timer *alert_timer; int full; int time_left;