From 7c4da3e8432ec6dc376d898cd51b53f1fab1c1ad Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 6 Feb 2013 09:11:33 +0000 Subject: [PATCH] convert more winlist and focus dialog widgets to use new check disable api SVN revision: 83666 --- .../e_int_config_focus.c | 27 ++-------- src/modules/winlist/e_int_config_winlist.c | 53 +++---------------- 2 files changed, 9 insertions(+), 71 deletions(-) diff --git a/src/modules/conf_window_manipulation/e_int_config_focus.c b/src/modules/conf_window_manipulation/e_int_config_focus.c index 403c93a65..15e638f34 100644 --- a/src/modules/conf_window_manipulation/e_int_config_focus.c +++ b/src/modules/conf_window_manipulation/e_int_config_focus.c @@ -10,7 +10,6 @@ static int _advanced_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _advanced_check_changed(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 Evas_Object *_advanced_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static void _cb_disable_check_list(void *data, Evas_Object *obj); /* Actual config data we will be playing with whil the dialog is active */ struct _E_Config_Dialog_Data @@ -34,7 +33,6 @@ struct _E_Config_Dialog_Data int border_raise_on_mouse_action; int border_raise_on_focus; int allow_above_fullscreen; - Eina_List *autoraise_list; }; /* a nice easy setup function that does the dirty work */ @@ -109,9 +107,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) static void _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { - eina_list_free(cfdata->autoraise_list); - /* Free the cfdata */ - E_FREE(cfdata); + free(cfdata); } /**--APPLY--**/ @@ -290,18 +286,13 @@ _advanced_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Da &(cfdata->use_auto_raise)); e_widget_framelist_object_append(of, autoraise_check); ob = e_widget_label_add(evas, _("Delay before raising:")); - cfdata->autoraise_list = eina_list_append(cfdata->autoraise_list, ob); - e_widget_disabled_set(ob, !cfdata->use_auto_raise); + e_widget_check_widget_disable_on_unchecked_add(autoraise_check, ob); e_widget_framelist_object_append(of, ob); ob = e_widget_slider_add(evas, 1, 0, _("%1.1f s"), 0.0, 9.9, 0.1, 0, &(cfdata->auto_raise_delay), NULL, 100); - cfdata->autoraise_list = eina_list_append(cfdata->autoraise_list, ob); - e_widget_disabled_set(ob, !cfdata->use_auto_raise); + e_widget_check_widget_disable_on_unchecked_add(autoraise_check, ob); e_widget_framelist_object_append(of, ob); e_widget_list_object_append(ol, of, 1, 0, 0.5); - // handler for enable/disable widget array - e_widget_on_change_hook_set(autoraise_check, - _cb_disable_check_list, cfdata->autoraise_list); of = e_widget_framelist_add(evas, _("Raise Window"), 0); e_widget_framelist_content_align_set(of, 0.0, 0.0); @@ -383,15 +374,3 @@ _advanced_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Da e_widget_toolbook_page_show(otb, 0); return otb; } - -static void -_cb_disable_check_list(void *data, Evas_Object *obj) -{ - const Eina_List *list = data; - const Eina_List *l; - Evas_Object *o; - Eina_Bool disable = !e_widget_check_checked_get(obj); - - EINA_LIST_FOREACH(list, l, o) - e_widget_disabled_set(o, disable); -} diff --git a/src/modules/winlist/e_int_config_winlist.c b/src/modules/winlist/e_int_config_winlist.c index e29ace1fb..6c3b444f5 100644 --- a/src/modules/winlist/e_int_config_winlist.c +++ b/src/modules/winlist/e_int_config_winlist.c @@ -5,8 +5,6 @@ static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdat static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_check_changed(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 void _iconified_changed(void *data, Evas_Object *obj); -static void _scroll_animate_changed(void *data, Evas_Object *obj); static void _width_limits_changed(void *data, Evas_Object *obj __UNUSED__); static void _height_limits_changed(void *data, Evas_Object *obj __UNUSED__); @@ -32,8 +30,6 @@ struct _E_Config_Dialog_Data struct { - Eina_List *disable_iconified; - Eina_List *disable_scroll_animate; Evas_Object *min_w, *min_h; } gui; }; @@ -107,8 +103,6 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) static void _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { - eina_list_free(cfdata->gui.disable_iconified); - eina_list_free(cfdata->gui.disable_scroll_animate); free(cfdata); } @@ -190,20 +184,16 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data ob = e_widget_check_add(evas, _("Windows from other screens"), &(cfdata->windows_other_screens)); e_widget_list_object_append(ol, ob, 1, 0, 0.0); - ob = e_widget_check_add(evas, _("Iconified"), &(cfdata->iconified)); - iconified = ob; - e_widget_on_change_hook_set(ob, _iconified_changed, cfdata); + iconified = ob = e_widget_check_add(evas, _("Iconified"), &(cfdata->iconified)); e_widget_list_object_append(ol, ob, 1, 0, 0.0); ob = e_widget_check_add(evas, _("Iconified from other desks"), &(cfdata->iconified_other_desks)); e_widget_list_object_append(ol, ob, 1, 0, 0.0); - cfdata->gui.disable_iconified = - eina_list_append(cfdata->gui.disable_iconified, ob); + e_widget_check_widget_disable_on_unchecked_add(iconified, ob); ob = e_widget_check_add(evas, _("Iconified from other screens"), &(cfdata->iconified_other_screens)); e_widget_list_object_append(ol, ob, 1, 0, 0.0); - cfdata->gui.disable_iconified = - eina_list_append(cfdata->gui.disable_iconified, ob); + e_widget_check_widget_disable_on_unchecked_add(iconified, ob); e_widget_toolbook_page_append(otb, NULL, _("Display"), ol, 0, 0, 1, 0, 0.5, 0.0); @@ -232,19 +222,15 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data 0, 0, 1, 0, 0.5, 0.0); ol = e_widget_list_add(evas, 0, 0); - ob = e_widget_check_add(evas, _("Scroll Animation"), + scroll_animate = ob = e_widget_check_add(evas, _("Scroll Animation"), &(cfdata->scroll_animate)); - e_widget_on_change_hook_set(ob, _scroll_animate_changed, cfdata); - scroll_animate = ob; e_widget_list_object_append(ol, ob, 1, 0, 0.0); ob = e_widget_label_add(evas, _("Scroll speed")); - cfdata->gui.disable_scroll_animate = - eina_list_append(cfdata->gui.disable_scroll_animate, ob); + e_widget_check_widget_disable_on_unchecked_add(scroll_animate, ob); e_widget_list_object_append(ol, ob, 1, 0, 0.0); ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, &(cfdata->scroll_speed), NULL, 100); - cfdata->gui.disable_scroll_animate = - eina_list_append(cfdata->gui.disable_scroll_animate, ob); + e_widget_check_widget_disable_on_unchecked_add(scroll_animate, ob); e_widget_list_object_append(ol, ob, 1, 0, 0.0); e_widget_toolbook_page_append(otb, NULL, _("Animations"), ol, 0, 0, 1, 0, 0.5, 0.0); @@ -293,9 +279,6 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data e_widget_toolbook_page_append(otb, NULL, _("Alignment"), ol, 0, 0, 1, 0, 0.5, 0.0); - _iconified_changed(cfdata, iconified); - _scroll_animate_changed(cfdata, scroll_animate); - e_widget_toolbook_page_show(otb, 0); return otb; @@ -333,30 +316,6 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data */ } -static void -_iconified_changed(void *data, Evas_Object *obj) -{ - E_Config_Dialog_Data *cfdata = data; - const Eina_List *l; - Evas_Object *o; - Eina_Bool disabled = !e_widget_check_checked_get(obj); - - EINA_LIST_FOREACH(cfdata->gui.disable_iconified, l, o) - e_widget_disabled_set(o, disabled); -} - -static void -_scroll_animate_changed(void *data, Evas_Object *obj) -{ - E_Config_Dialog_Data *cfdata = data; - const Eina_List *l; - Evas_Object *o; - Eina_Bool disabled = !e_widget_check_checked_get(obj); - - EINA_LIST_FOREACH(cfdata->gui.disable_scroll_animate, l, o) - e_widget_disabled_set(o, disabled); -} - static void _width_limits_changed(void *data, Evas_Object *obj __UNUSED__) {