From a5fe37131619d79e44c6e589d5ff358f5c0fb005 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Wed, 3 Mar 2010 03:30:11 +0000 Subject: [PATCH] Revert frametable change. Need better organization here. SVN revision: 46812 --- .../e_int_config_screensaver.c | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/modules/conf_screensaver/e_int_config_screensaver.c b/src/modules/conf_screensaver/e_int_config_screensaver.c index 8aae533bc..ea30ebc34 100644 --- a/src/modules/conf_screensaver/e_int_config_screensaver.c +++ b/src/modules/conf_screensaver/e_int_config_screensaver.c @@ -10,10 +10,12 @@ 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); -static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, 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); +static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, + E_Config_Dialog_Data *cfdata); static void _cb_disable_basic(void *data, Evas_Object *obj); static void _cb_disable_adv(void *data, Evas_Object *obj); static void _cb_ask_presentation_changed(void *data, Evas_Object *obj); @@ -171,23 +173,23 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D xscreensaver_check = e_widget_check_add(evas, _("Enable X screensaver"), &(cfdata->enable_screensaver)); e_widget_list_object_append(o, xscreensaver_check, 1, 1, 0); - of = e_widget_frametable_add(evas, _("Screensaver Timer"), 0); + of = e_widget_framelist_add(evas, _("Screensaver Timer"), 0); ob = e_widget_label_add(evas, _("Initial timeout")); cfdata->disable_list = eina_list_append(cfdata->disable_list, ob); - e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 0, 0); + e_widget_framelist_object_append(of, ob); ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 90.0, 1.0, 0, &(cfdata->timeout), NULL, 100); cfdata->disable_list = eina_list_append(cfdata->disable_list, ob); - e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 0); + e_widget_framelist_object_append(of, ob); ob = e_widget_label_add(evas, _("Alternation timeout")); cfdata->disable_list = eina_list_append(cfdata->disable_list, ob); - e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 0, 0); + e_widget_framelist_object_append(of, ob); ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), 1.0, 300.0, 1.0, 0, &(cfdata->interval), NULL, 100); cfdata->disable_list = eina_list_append(cfdata->disable_list, ob); - e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 0); + e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); of = e_widget_framelist_add(evas, _("Presentation Mode"), 0);