Enlightenment CVS committal Author : sndev Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: e_int_gadcon_config.c Log Message: We donnot need ok/apply buttons in the "shelf contents" config dialog since the dialog directly operates on the gadcon client list. Therefore, if gcc is add and the dialog just closed then we have an inconsistency until the gcc will be unpopulated-populated. Moreover, thats much nicer from the UI point of view. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_gadcon_config.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_int_gadcon_config.c 7 Jun 2006 23:30:12 -0000 1.15 +++ e_int_gadcon_config.c 14 Jun 2006 18:43:07 -0000 1.16 @@ -6,7 +6,6 @@ /* PROTOTYPES - same all the time */ static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); /* Actual config data we will be playing with whil the dialog is active */ @@ -33,7 +32,7 @@ /* methods */ v->create_cfdata = _create_data; v->free_cfdata = _free_data; - v->basic.apply_cfdata = _basic_apply_data; + v->basic.apply_cfdata = NULL; //_basic_apply_data; v->basic.create_widgets = _basic_create_widgets; v->override_auto_apply = 1; @@ -94,18 +93,6 @@ free(cfdata); } -/**--APPLY--**/ -static int -_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) -{ - if (!cfdata->cf_gc) return 1; - - e_gadcon_unpopulate(cfdata->gc); - e_gadcon_populate(cfdata->gc); - e_config_save_queue(); - return 1; -} - static void _cb_select_client(void *data) { @@ -197,6 +184,10 @@ e_widget_ilist_go(cfdata->o_instances); e_widget_ilist_selected_set(cfdata->o_instances, e_widget_ilist_count(cfdata->o_instances) - 1); + + e_gadcon_unpopulate(cfdata->gc); + e_gadcon_populate(cfdata->gc); + e_config_save_queue(); } static void @@ -257,6 +248,9 @@ e_widget_disabled_set(cfdata->o_remove, 1); else e_widget_ilist_selected_set(cfdata->o_instances, i); + e_gadcon_unpopulate(cfdata->gc); + e_gadcon_populate(cfdata->gc); + e_config_save_queue(); } /**--GUI--**/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs