From 08c44b3bfd4248a3647c78ab4c2148ff145b699f Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Mon, 15 Mar 2010 20:38:49 +0000 Subject: [PATCH] Rework pager config dialog for smaller screen resolutions (using toolbook). NB: May need label changes. Still needs 'check_changed' code too, but the bulk of the work is done. SVN revision: 47252 --- src/modules/pager/e_mod_config.c | 334 ++++++++++++++++--------------- 1 file changed, 172 insertions(+), 162 deletions(-) diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c index 7c8d2878d..fd9ae18d4 100644 --- a/src/modules/pager/e_mod_config.c +++ b/src/modules/pager/e_mod_config.c @@ -5,62 +5,59 @@ #define BUTTON_NOPLACE 1 #define BUTTON_DESK 2 -struct _E_Config_Dialog_Data +struct _E_Config_Dialog_Data { - struct + struct { int show, urgent_show, urgent_stick; double speed, urgent_speed; - int height; - int act_height; + int height, act_height; } popup; - int drag_resist, flip_desk, show_desk_names; - struct + struct { unsigned int drag, noplace, desk; } btn; - struct + struct { Ecore_X_Window bind_win; E_Dialog *dia; Eina_List *hdls; int btn; } grab; - struct + struct { - Evas_Object *o_btn1, *o_btn2, *o_btn3; + Evas_Object *ob1, *ob2, *ob3; + Eina_List *popup_list, *urgent_list; } gui; + int drag_resist, flip_desk, show_desk_names; }; +/* local function prototypes */ static void *_create_data(E_Config_Dialog *cfd); -static void _fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata); -static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static void _grab_wnd_show(void *data1, void *data2); +static void _fill_data(E_Config_Dialog_Data *cfdata); +static void _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); +static Evas_Object *_adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); +static void _update_btn_lbl(E_Config_Dialog_Data *cfdata); +static void _grab_window_show(void *data1, void *data2); static int _grab_cb_mouse_down(void *data, int type, void *event); static int _grab_cb_key_down(void *data, int type, void *event); -static void _grab_wnd_hide(E_Config_Dialog_Data *cfdata); -static void _adv_update_btn_lbl(E_Config_Dialog_Data *cfdata); +static void _grab_window_hide(E_Config_Dialog_Data *cfdata); static void _cb_disable_check_list(void *data, Evas_Object *obj); -Eina_List *popup_list = NULL; - -void -_config_pager_module(Config_Item *ci) +void +_config_pager_module(Config_Item *ci) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; E_Container *con; - char buf[4096]; + char buff[PATH_MAX]; v = E_NEW(E_Config_Dialog_View, 1); if (!v) return; - snprintf(buf, sizeof(buf), "%s/e-module-pager.edj", - e_module_dir_get(pager_config->module)); v->create_cfdata = _create_data; v->free_cfdata = _free_data; v->basic.create_widgets = _basic_create; @@ -68,31 +65,33 @@ _config_pager_module(Config_Item *ci) v->advanced.create_widgets = _adv_create; v->advanced.apply_cfdata = _adv_apply; + snprintf(buff, sizeof(buff), "%s/e-module-pager.edj", + pager_config->module->dir); con = e_container_current_get(e_manager_current_get()); - cfd = e_config_dialog_new(con, _("Pager Settings"), "E", - "_e_mod_pager_config_dialog", buf, 0, v, ci); + cfd = e_config_dialog_new(con, _("Pager Settings"), "E", + "_e_mod_pager_config_dialog", buff, 0, v, ci); pager_config->config_dialog = cfd; } +/* local function prototypes */ static void * -_create_data(E_Config_Dialog *cfd) +_create_data(E_Config_Dialog *cfd) { E_Config_Dialog_Data *cfdata; cfdata = E_NEW(E_Config_Dialog_Data, 1); - _fill_data(cfd->data, cfdata); + _fill_data(cfdata); return cfdata; } -static void -_fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata) +static void +_fill_data(E_Config_Dialog_Data *cfdata) { cfdata->popup.show = pager_config->popup; cfdata->popup.speed = pager_config->popup_speed; cfdata->popup.urgent_show = pager_config->popup_urgent; cfdata->popup.urgent_stick = pager_config->popup_urgent_stick; cfdata->popup.urgent_speed = pager_config->popup_urgent_speed; - cfdata->show_desk_names = pager_config->show_desk_names; cfdata->popup.height = pager_config->popup_height; cfdata->popup.act_height = pager_config->popup_act_height; cfdata->drag_resist = pager_config->drag_resist; @@ -100,153 +99,169 @@ _fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata) cfdata->btn.noplace = pager_config->btn_noplace; cfdata->btn.desk = pager_config->btn_desk; cfdata->flip_desk = pager_config->flip_desk; + cfdata->show_desk_names = pager_config->show_desk_names; } -static void -_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +static void +_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { - popup_list = eina_list_free(popup_list); + cfdata->gui.popup_list = eina_list_free(cfdata->gui.popup_list); + cfdata->gui.urgent_list = eina_list_free(cfdata->gui.urgent_list); pager_config->config_dialog = NULL; E_FREE(cfdata); } static Evas_Object * -_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) { - Evas_Object *o = NULL, *of = NULL, *ow = NULL; + Evas_Object *ol, *of, *ow; - o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, _("General Settings"), 0); - ow = e_widget_check_add(evas, _("Flip desktop on mouse wheel"), + ol = e_widget_list_add(evas, 0, 0); + + of = e_widget_framelist_add(evas, _("General"), 0); + ow = e_widget_check_add(evas, _("Flip desktop on mouse wheel"), &(cfdata->flip_desk)); e_widget_framelist_object_append(of, ow); - ow = e_widget_check_add(evas, _("Show desktop names"), + ow = e_widget_check_add(evas, _("Show desktop names"), &(cfdata->show_desk_names)); e_widget_framelist_object_append(of, ow); - e_widget_list_object_append(o, of, 1, 1, 0.5); + e_widget_list_object_append(ol, of, 1, 0, 0.5); - of = e_widget_framelist_add(evas, _("Popup Settings"), 0); - ow = e_widget_check_add(evas, _("Show popup on desktop change"), + of = e_widget_framelist_add(evas, _("Popup"), 0); + ow = e_widget_check_add(evas, _("Show popup on desktop change"), &(cfdata->popup.show)); e_widget_framelist_object_append(of, ow); - ow = e_widget_check_add(evas, _("Show popup for urgent windows"), + ow = e_widget_check_add(evas, _("Show popup for urgent windows"), &(cfdata->popup.urgent_show)); e_widget_framelist_object_append(of, ow); - e_widget_list_object_append(o, of, 1, 1, 0.5); + e_widget_list_object_append(ol, of, 1, 0, 0.5); - return o; + return ol; } -static int -_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +static int +_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { pager_config->popup = cfdata->popup.show; pager_config->flip_desk = cfdata->flip_desk; pager_config->show_desk_names = cfdata->show_desk_names; pager_config->popup_urgent = cfdata->popup.urgent_show; -// _pager_config_updated(); e_config_save_queue(); return 1; } static Evas_Object * -_adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +_adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) { - Evas_Object *o = NULL, *of = NULL, *ow = NULL; - Evas_Object *popup_check = NULL; + Evas_Object *otb, *ol, *ow; + Evas_Object *pc, *uc; - o = e_widget_list_add(evas, 0, 0); - of = e_widget_frametable_add(evas, _("General Settings"), 0); - ow = e_widget_check_add(evas, _("Flip desktop on mouse wheel"), + otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale)); + + /* General Page */ + ol = e_widget_list_add(evas, 0, 0); + ow = e_widget_check_add(evas, _("Flip desktop on mouse wheel"), &(cfdata->flip_desk)); - e_widget_frametable_object_append(of, ow, 0, 0, 2, 1, 1, 0, 1, 0); - ow = e_widget_check_add(evas, _("Show desktop names"), + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_check_add(evas, _("Show desktop names"), &(cfdata->show_desk_names)); - e_widget_frametable_object_append(of, ow, 0, 1, 2, 1, 1, 0, 1, 0); -#if 0 - /* FIXME: disable move in pager for now, as dropping in between - desks causes lost window */ - ow = e_widget_label_add(evas, _("Select and Slide button")); - e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0); - ow = e_widget_button_add(evas, _("Click to set"), NULL, - _grab_wnd_show, (void *)BUTTON_DRAG, cfdata); - cfdata->gui.o_btn1 = ow; - e_widget_frametable_object_append(of, ow, 1, 2, 1, 1, 0, 0, 1, 0); -#endif - ow = e_widget_label_add(evas, _("Drag and Drop button")); - e_widget_frametable_object_append(of, ow, 0, 3, 1, 1, 1, 0, 1, 0); - ow = e_widget_button_add(evas, _("Click to set"), NULL, - _grab_wnd_show, (void *)BUTTON_NOPLACE, cfdata); - cfdata->gui.o_btn2 = ow; - e_widget_frametable_object_append(of, ow, 1, 3, 1, 1, 0, 0, 1, 0); - - ow = e_widget_label_add(evas, _("Drag whole desktop")); - e_widget_frametable_object_append(of, ow, 0, 4, 1, 1, 1, 0, 1, 0); - ow = e_widget_button_add(evas, _("Click to set"), NULL, - _grab_wnd_show, (void *)BUTTON_DESK, cfdata); - cfdata->gui.o_btn3 = ow; - e_widget_frametable_object_append(of, ow, 1, 4, 1, 1, 0, 0, 1, 0); - _adv_update_btn_lbl(cfdata); - - /* TODO find better name */ + e_widget_list_object_append(ol, ow, 1, 0, 0.5); ow = e_widget_label_add(evas, _("Keyaction popup height")); - e_widget_frametable_object_append(of, ow, 0, 5, 1, 1, 1, 0, 1, 0); - ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 20.0, 200.0, 1.0, 0, NULL, + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 20.0, 200.0, 1.0, 0, NULL, &(cfdata->popup.act_height), 100); - e_widget_frametable_object_append(of, ow, 1, 5, 1, 1, 1, 0, 1, 0); - + e_widget_list_object_append(ol, ow, 1, 0, 0.5); ow = e_widget_label_add(evas, _("Resistance to dragging")); - e_widget_frametable_object_append(of, ow, 0, 6, 1, 1, 1, 0, 1, 0); - ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 0.0, 10.0, 1.0, 0, NULL, + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 0.0, 10.0, 1.0, 0, NULL, &(cfdata->drag_resist), 100); - e_widget_frametable_object_append(of, ow, 1, 6, 1, 1, 1, 0, 1, 0); - e_widget_list_object_append(o, of, 1, 1, 0.5); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + +#if 0 + ow = e_widget_label_add(evas, _("Select and Slide button")); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_button_add(evas, _("Click to set"), NULL, + _grab_window_show, (void *)BUTTON_DRAG, cfdata); + cfdata->gui.ob1 = ow; + e_widget_list_object_append(ol, ow, 1, 0, 0.5); +#endif + + ow = e_widget_label_add(evas, _("Drag and Drop button")); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_button_add(evas, _("Click to set"), NULL, + _grab_window_show, (void *)BUTTON_NOPLACE, cfdata); + cfdata->gui.ob2 = ow; + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_label_add(evas, _("Drag whole desktop")); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_button_add(evas, _("Click to set"), NULL, + _grab_window_show, (void *)BUTTON_DESK, cfdata); + cfdata->gui.ob3 = ow; + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + _update_btn_lbl(cfdata); + e_widget_toolbook_page_append(otb, NULL, _("General"), ol, 1, 0, 1, 0, + 0.5, 0.0); + + /* Popup Page */ + ol = e_widget_list_add(evas, 0, 0); + pc = e_widget_check_add(evas, _("Show popup on desktop change"), + &(cfdata->popup.show)); + e_widget_list_object_append(ol, pc, 1, 0, 0.5); - of = e_widget_frametable_add(evas, _("Popup Settings"), 0); - popup_check = e_widget_check_add(evas, _("Show popup on desktop change"), - &(cfdata->popup.show)); - e_widget_frametable_object_append(of, popup_check, 0, 0, 2, 1, 1, 0, 1, 0); ow = e_widget_label_add(evas, _("Popup pager height")); - popup_list = eina_list_append (popup_list, ow); - e_widget_disabled_set(ow, !cfdata->popup.show); // set state from saved config - e_widget_frametable_object_append(of, ow, 0, 1, 1, 1, 1, 0, 1, 0); - ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 20.0, 200.0, 1.0, 0, NULL, + cfdata->gui.popup_list = eina_list_append(cfdata->gui.popup_list, ow); + e_widget_disabled_set(ow, !cfdata->popup.show); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 20.0, 200.0, 1.0, 0, NULL, &(cfdata->popup.height), 100); - popup_list = eina_list_append (popup_list, ow); - e_widget_disabled_set(ow, !cfdata->popup.show); // set state from saved config - e_widget_frametable_object_append(of, ow, 1, 1, 1, 1, 1, 0, 1, 0); + cfdata->gui.popup_list = eina_list_append(cfdata->gui.popup_list, ow); + e_widget_disabled_set(ow, !cfdata->popup.show); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_label_add(evas, _("Popup speed")); - popup_list = eina_list_append (popup_list, ow); - e_widget_disabled_set(ow, !cfdata->popup.show); // set state from saved config - e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0); - ow = e_widget_slider_add(evas, 1, 0, _("%1.1f seconds"), 0.1, 10.0, 0.1, 0, + cfdata->gui.popup_list = eina_list_append(cfdata->gui.popup_list, ow); + e_widget_disabled_set(ow, !cfdata->popup.show); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%1.1f seconds"), 0.1, 10.0, 0.1, 0, &(cfdata->popup.speed), NULL, 100); - popup_list = eina_list_append (popup_list, ow); - e_widget_disabled_set(ow, !cfdata->popup.show); // set state from saved config - e_widget_frametable_object_append(of, ow, 1, 2, 1, 1, 1, 0, 1, 0); - e_widget_list_object_append(o, of, 1, 1, 0.5); - // handler for enable/disable widget array - e_widget_on_change_hook_set(popup_check, _cb_disable_check_list, popup_list); + cfdata->gui.popup_list = eina_list_append(cfdata->gui.popup_list, ow); + e_widget_disabled_set(ow, !cfdata->popup.show); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + e_widget_on_change_hook_set(pc, _cb_disable_check_list, + cfdata->gui.popup_list); + e_widget_toolbook_page_append(otb, NULL, _("Popup"), ol, 1, 0, 1, 0, + 0.5, 0.0); - of = e_widget_frametable_add(evas, _("Urgent Window Settings"), 0); - ow = e_widget_check_add(evas, _("Show popup on urgent window"), + /* Urgent Page */ + ol = e_widget_list_add(evas, 0, 0); + uc = e_widget_check_add(evas, _("Show popup on urgent window"), &(cfdata->popup.urgent_show)); - e_widget_frametable_object_append(of, ow, 0, 0, 2, 1, 1, 0, 1, 0); - ow = e_widget_check_add(evas, _("Popup on urgent window sticks on the screen"), + e_widget_list_object_append(ol, uc, 1, 0, 0.5); + ow = e_widget_check_add(evas, _("Urgent popup sticks on screen"), &(cfdata->popup.urgent_stick)); - e_widget_frametable_object_append(of, ow, 0, 1, 2, 1, 1, 0, 1, 0); - ow = e_widget_label_add(evas, _("Popup speed")); - e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0); - ow = e_widget_slider_add(evas, 1, 0, _("%1.1f seconds"), 0.1, 10.0, 0.1, 0, + cfdata->gui.urgent_list = eina_list_append(cfdata->gui.urgent_list, ow); + e_widget_disabled_set(ow, !cfdata->popup.urgent_show); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_label_add(evas, _("Urgent popup speed")); + cfdata->gui.urgent_list = eina_list_append(cfdata->gui.urgent_list, ow); + e_widget_disabled_set(ow, !cfdata->popup.urgent_show); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%1.1f seconds"), 0.1, 10.0, 0.1, 0, &(cfdata->popup.urgent_speed), NULL, 100); - e_widget_frametable_object_append(of, ow, 1, 2, 1, 1, 1, 0, 1, 0); - e_widget_list_object_append(o, of, 1, 1, 0.5); + cfdata->gui.urgent_list = eina_list_append(cfdata->gui.urgent_list, ow); + e_widget_disabled_set(ow, !cfdata->popup.urgent_show); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); + e_widget_on_change_hook_set(uc, _cb_disable_check_list, + cfdata->gui.urgent_list); + e_widget_toolbook_page_append(otb, NULL, _("Urgent Windows"), ol, + 1, 0, 1, 0, 0.5, 0.0); - return o; + e_widget_toolbook_page_show(otb, 0); + return otb; } -static int -_adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +static int +_adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { pager_config->popup = cfdata->popup.show; pager_config->popup_speed = cfdata->popup.speed; @@ -261,13 +276,33 @@ _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) pager_config->btn_drag = cfdata->btn.drag; pager_config->btn_noplace = cfdata->btn.noplace; pager_config->btn_desk = cfdata->btn.desk; -// _pager_config_updated(); e_config_save_queue(); return 1; } -static void -_grab_wnd_show(void *data1, void *data2) +static void +_update_btn_lbl(E_Config_Dialog_Data *cfdata) +{ + char lbl[256]; + +#if 0 + snprintf(lbl, sizeof(lbl), _("Click to set")); + if (cfdata->btn.drag) + snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.drag); + e_widget_button_label_set(cfdata->gui.ob1, lbl); +#endif + snprintf(lbl, sizeof(lbl), _("Click to set")); + if (cfdata->btn.noplace) + snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.noplace); + e_widget_button_label_set(cfdata->gui.ob2, lbl); + snprintf(lbl, sizeof(lbl), _("Click to set")); + if (cfdata->btn.desk) + snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.desk); + e_widget_button_label_set(cfdata->gui.ob3, lbl); +} + +static void +_grab_window_show(void *data1, void *data2) { E_Manager *man = NULL; E_Config_Dialog_Data *cfdata = NULL; @@ -348,7 +383,7 @@ _grab_cb_mouse_down(void *data, int type, void *event) "code for context menus.
" "This button only works in the Popup")); } - _grab_wnd_hide(cfdata); + _grab_window_hide(cfdata); return 1; } @@ -361,7 +396,7 @@ _grab_cb_key_down(void *data, int type, void *event) ev = event; if (!(cfdata = data)) return 1; if (ev->window != cfdata->grab.bind_win) return 1; - if (!strcmp(ev->keyname, "Escape")) _grab_wnd_hide(cfdata); + if (!strcmp(ev->keyname, "Escape")) _grab_window_hide(cfdata); if (!strcmp(ev->keyname, "Delete")) { if (cfdata->grab.btn == 1) @@ -370,13 +405,13 @@ _grab_cb_key_down(void *data, int type, void *event) cfdata->btn.noplace = 0; else cfdata->btn.desk = 0; - _grab_wnd_hide(cfdata); + _grab_window_hide(cfdata); } return 1; } static void -_grab_wnd_hide(E_Config_Dialog_Data *cfdata) +_grab_window_hide(E_Config_Dialog_Data *cfdata) { while (cfdata->grab.hdls) { @@ -392,36 +427,11 @@ _grab_wnd_hide(E_Config_Dialog_Data *cfdata) if (cfdata->grab.dia) e_object_del(E_OBJECT(cfdata->grab.dia)); cfdata->grab.dia = NULL; - _adv_update_btn_lbl(cfdata); + _update_btn_lbl(cfdata); } -static void -_adv_update_btn_lbl(E_Config_Dialog_Data *cfdata) -{ - char lbl[256] = ""; -#if 0 - snprintf(lbl, sizeof(lbl), _("Click to set")); - if (cfdata->btn.drag) - snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.drag); - e_widget_button_label_set(cfdata->gui.o_btn1, lbl); -#endif - snprintf(lbl, sizeof(lbl), _("Click to set")); - if (cfdata->btn.noplace) - snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.noplace); - e_widget_button_label_set(cfdata->gui.o_btn2, lbl); - - snprintf(lbl, sizeof(lbl), _("Click to set")); - if (cfdata->btn.desk) - snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.desk); - e_widget_button_label_set(cfdata->gui.o_btn3, lbl); -} - -/*! - * @param data A Eina_List of Evas_Object to chain widgets together with the checkbox - * @param obj A Evas_Object checkbox created with e_widget_check_add() - */ -static void -_cb_disable_check_list(void *data, Evas_Object *obj) +static void +_cb_disable_check_list(void *data, Evas_Object *obj) { Eina_List *list = (Eina_List*) data; Eina_List *l;