This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch netbsd_support
in repository enlightenment.
View the commit online.
commit 71bbcbc4251eff7918e2fd2a3e7cd07dc31f5da1
Author: Carsten Haitzler <[email protected]>
AuthorDate: Thu Jul 23 20:53:58 2026 +0100
bluez5 - use new icon only look for adapter state/controls
looks nicer
---
src/modules/bluez5/e_mod_main.h | 2 +-
src/modules/bluez5/e_mod_popup.c | 12 ++++++++----
src/modules/bluez5/e_mod_util.c | 22 +++++++++++++++-------
3 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/src/modules/bluez5/e_mod_main.h b/src/modules/bluez5/e_mod_main.h
index f9bf4935b..3d8c91bcc 100644
--- a/src/modules/bluez5/e_mod_main.h
+++ b/src/modules/bluez5/e_mod_main.h
@@ -78,7 +78,7 @@ void ebluez5_agent_auth_service(Eldbus_Message *msg);
Evas_Object *util_obj_icon_add(Evas_Object *base, Obj *o, int size);
Evas_Object *util_obj_icon_rssi_add(Evas_Object *base, Obj *o, int size);
-Evas_Object *util_check_add(Evas_Object *base, const char *text, const char *tip, Eina_Bool state);
+Evas_Object *util_check_add(Evas_Object *base, const char *text, const char *icon, const char *tip, Eina_Bool state);
Evas_Object *util_button_icon_add(Evas_Object *base, const char *icon, const char *tip);
const char *util_obj_name_get(Obj *o);
diff --git a/src/modules/bluez5/e_mod_popup.c b/src/modules/bluez5/e_mod_popup.c
index c6eb1ffcb..b56b44a27 100644
--- a/src/modules/bluez5/e_mod_popup.c
+++ b/src/modules/bluez5/e_mod_popup.c
@@ -450,25 +450,29 @@ _cb_adapt_content_get(void *data EINA_UNUSED, Evas_Object *obj,
evas_object_size_hint_weight_set(tab, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(tab, EVAS_HINT_FILL, 0.0);
- ck = util_check_add(obj, _("Power"), _("Enable power for this adapter"),
+ ck = util_check_add(obj, NULL/*_("Power")*/, "power",
+ _("Enable power for this adapter"),
o->powered);
evas_object_smart_callback_add(ck, "changed", _cb_power, o);
elm_table_pack(tab, ck, 0, 0, 1, 1);
evas_object_show(ck);
- ck = util_check_add(obj, _("Visible"), _("Make this adapter visible to other devices"),
+ ck = util_check_add(obj, NULL/*_("Visible")*/, "view",
+ _("Make this adapter visible to other devices"),
o->discoverable);
evas_object_smart_callback_add(ck, "changed", _cb_visible, o);
elm_table_pack(tab, ck, 1, 0, 1, 1);
evas_object_show(ck);
- ck = util_check_add(obj, _("Scan"), _("Scan for other devices"),
+ ck = util_check_add(obj, NULL/*_("Scan")*/, "search",
+ _("Scan for other devices"),
o->discovering);
evas_object_smart_callback_add(ck, "changed", _cb_scan, o);
elm_table_pack(tab, ck, 0, 1, 1, 1);
evas_object_show(ck);
- ck = util_check_add(obj, _("Pairable"), _("Allow this adapter to have other devices request to pair with it"),
+ ck = util_check_add(obj, NULL/*_("Pairable")*/, "pair",
+ _("Allow this adapter to have other devices request to pair with it"),
o->pairable);
evas_object_smart_callback_add(ck, "changed", _cb_pairable, o);
elm_table_pack(tab, ck, 1, 1, 1, 1);
diff --git a/src/modules/bluez5/e_mod_util.c b/src/modules/bluez5/e_mod_util.c
index 13838d60d..ab75e3a1a 100644
--- a/src/modules/bluez5/e_mod_util.c
+++ b/src/modules/bluez5/e_mod_util.c
@@ -229,14 +229,22 @@ util_obj_icon_rssi_add(Evas_Object *base, Obj *o, int size)
}
Evas_Object *
-util_check_add(Evas_Object *base, const char *text, const char *tip, Eina_Bool state)
+util_check_add(Evas_Object *base, const char *text, const char *icon, const char *tip, Eina_Bool state)
{
- Evas_Object *ck = elm_check_add(base);
- evas_object_size_hint_align_set(ck, 0.0, EVAS_HINT_FILL);
- elm_layout_text_set(ck, NULL, text);
- elm_object_tooltip_text_set(ck, tip);
- elm_check_state_set(ck, state);
- return ck;
+ Evas_Object *ck = elm_check_add(base);
+ elm_object_style_set(ck, "plain");
+ evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_object_text_set(ck, text);
+ elm_object_tooltip_text_set(ck, tip);
+ elm_check_state_set(ck, state);
+ if (icon)
+ {
+ Evas_Object *ic = elm_icon_add(base);
+ elm_icon_standard_set(ic, icon);
+ elm_object_part_content_set(ck, NULL, ic);
+ evas_object_show(ic);
+ }
+ return ck;
}
Evas_Object *
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
