From 133cd23563fcfbd341b87a23beb8ac75f584327b Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 24 May 2006 02:49:07 +0000 Subject: [PATCH] disable auto apply - all the people reporting problems have it enabled. SVN revision: 22857 --- src/bin/e_config.c | 3 +++ src/bin/e_int_config_cfgdialogs.c | 25 ++++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 5fb9e7709..fd145ce9b 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -1213,6 +1213,9 @@ e_config_init(void) E_CONFIG_LIMIT(e_config->display_res_height, 1, 8192); E_CONFIG_LIMIT(e_config->display_res_hz, 0, 250); E_CONFIG_LIMIT(e_config->display_res_rotation, 0, 0xff); + + /* FIXME: disabled auto apply because it causes problems */ + e_config->cfgdlg_auto_apply = 0; e_config_save_queue(); diff --git a/src/bin/e_int_config_cfgdialogs.c b/src/bin/e_int_config_cfgdialogs.c index e3fcd551a..5815d2e7d 100644 --- a/src/bin/e_int_config_cfgdialogs.c +++ b/src/bin/e_int_config_cfgdialogs.c @@ -70,13 +70,24 @@ static Evas_Object * _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *of, *ob; + E_Radio_Group *rg; o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, _("General Settings"), 0); - ob = e_widget_check_add(evas, _("Auto-Apply Configuration Changes"), &(cfdata->auto_apply)); +// of = e_widget_framelist_add(evas, _("General Settings"), 0); +// ob = e_widget_check_add(evas, _("Auto-Apply Configuration Changes"), &(cfdata->auto_apply)); +// e_widget_framelist_object_append(of, ob); +// e_widget_list_object_append(o, of, 1, 1, 0.5); + + of = e_widget_framelist_add(evas, _("Default Dialog Mode"), 0); + rg = e_widget_radio_group_new(&(cfdata->default_mode)); + + ob = e_widget_radio_add(evas, _("Basic Mode"), E_CONFIG_DIALOG_CFDATA_TYPE_BASIC, rg); e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); + ob = e_widget_radio_add(evas, _("Advanced Mode"), E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED, rg); + e_widget_framelist_object_append(of, ob); + + e_widget_list_object_append(o, of, 1, 1, 0.5); return o; } @@ -97,10 +108,10 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, _("General Settings"), 0); - ob = e_widget_check_add(evas, _("Auto-Apply Configuration Changes"), &(cfdata->auto_apply)); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); +// of = e_widget_framelist_add(evas, _("General Settings"), 0); +// ob = e_widget_check_add(evas, _("Auto-Apply Configuration Changes"), &(cfdata->auto_apply)); +// e_widget_framelist_object_append(of, ob); +// e_widget_list_object_append(o, of, 1, 1, 0.5); of = e_widget_framelist_add(evas, _("Default Dialog Mode"), 0); rg = e_widget_radio_group_new(&(cfdata->default_mode));