Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config_dialog.c e_config_dialog.h e_int_config_desks.c
e_int_config_focus.c e_int_config_menus.c
e_int_config_performance.c e_int_config_startup.c
e_int_config_window_display.c
e_int_config_window_manipulation.c e_int_config_winlist.c
Log Message:
Fix bug where changing a config value then selecting a different page
(Basic/Advanced) would reset the value to it's original state. Fix config
dialogs to work correctly for this. Going for the modules config dialogs next.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config_dialog.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_config_dialog.c 23 Jan 2006 18:49:53 -0000 1.20
+++ e_config_dialog.c 13 Feb 2006 15:36:56 -0000 1.21
@@ -23,7 +23,6 @@
{
E_Config_Dialog *cfd;
-
cfd = E_OBJECT_ALLOC(E_Config_Dialog, E_CONFIG_DIALOG_TYPE,
_e_config_dialog_free);
cfd->view = view;
cfd->con = con;
@@ -35,7 +34,8 @@
}
cfd->data = data;
cfd->hide_buttons = 1;
-
+ cfd->cfg_changed = 0;
+
if ((cfd->view->basic.apply_cfdata) || (cfd->view->advanced.apply_cfdata))
cfd->hide_buttons = 0;
@@ -76,7 +76,6 @@
pdia = cfd->dia;
cfd->dia = e_dialog_new(cfd->con);
cfd->dia->data = cfd;
- cfd->view_dirty=0;
e_object_del_attach_func_set(E_OBJECT(cfd->dia),
_e_config_dialog_cb_dialog_del);
e_dialog_title_set(cfd->dia, cfd->title);
if (cfd->icon) e_dialog_icon_set(cfd->dia, cfd->icon, cfd->icon_size);
@@ -122,8 +121,11 @@
{
e_dialog_button_add(cfd->dia, _("OK"), NULL, _e_config_dialog_cb_ok,
cfd);
e_dialog_button_add(cfd->dia, _("Apply"), NULL,
_e_config_dialog_cb_apply, cfd);
- e_dialog_button_disable_num_set(cfd->dia, 0, 1);
- e_dialog_button_disable_num_set(cfd->dia, 1, 1);
+ if (!cfd->cfg_changed)
+ {
+ e_dialog_button_disable_num_set(cfd->dia, 0, 1);
+ e_dialog_button_disable_num_set(cfd->dia, 1, 1);
+ }
}
/* FIXME: This wont catch the window border close button, but that is
probably not cancelable. */
e_dialog_button_add(cfd->dia, _("Close"), NULL, _e_config_dialog_cb_close,
cfd);
@@ -208,6 +210,7 @@
}
if ((ok) && (!cfd->hide_buttons))
{
+ cfd->cfg_changed = 0;
e_dialog_button_disable_num_set(cfd->dia, 0, 1);
e_dialog_button_disable_num_set(cfd->dia, 1, 1);
}
@@ -239,6 +242,7 @@
cfd = data;
if (!cfd->hide_buttons)
{
+ cfd->cfg_changed = 1;
e_dialog_button_disable_num_set(cfd->dia, 0, 0);
e_dialog_button_disable_num_set(cfd->dia, 1, 0);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config_dialog.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_config_dialog.h 22 Jan 2006 14:18:20 -0000 1.8
+++ e_config_dialog.h 13 Feb 2006 15:36:56 -0000 1.9
@@ -43,7 +43,7 @@
int icon_size;
E_Dialog *dia;
void *data;
- int view_dirty;
+ int cfg_changed;
int hide_buttons;
};
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_desks.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_int_config_desks.c 30 Jan 2006 02:46:00 -0000 1.12
+++ e_int_config_desks.c 13 Feb 2006 15:36:56 -0000 1.13
@@ -148,9 +148,7 @@
{
/* generate the core widget layout for a basic dialog */
Evas_Object *o, *ob, *of, *ot;
-
- _fill_data(cfdata);
-
+
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Number of Desktops"), 0);
@@ -177,8 +175,6 @@
/* generate the core widget layout for an advanced dialog */
Evas_Object *o, *ob, *of, *ot;
- _fill_data(cfdata);
-
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Number of Desktops"), 0);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_focus.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_int_config_focus.c 3 Feb 2006 06:16:25 -0000 1.10
+++ e_int_config_focus.c 13 Feb 2006 15:36:56 -0000 1.11
@@ -149,9 +149,7 @@
/* generate the core widget layout for a basic dialog */
Evas_Object *o, *ob;
E_Radio_Group *rg;
-
- _fill_data(cfdata);
-
+
o = e_widget_list_add(evas, 0, 0);
rg = e_widget_radio_group_new(&(cfdata->mode));
ob = e_widget_radio_add(evas, _("Click Window to Focus"), E_FOCUS_CLICK,
rg);
@@ -169,9 +167,7 @@
/* generate the core widget layout for an advanced dialog */
Evas_Object *o, *ob, *of;
E_Radio_Group *rg;
-
- _fill_data(cfdata);
-
+
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Focus"), 0);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_menus.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_int_config_menus.c 22 Jan 2006 14:12:17 -0000 1.4
+++ e_int_config_menus.c 13 Feb 2006 15:36:56 -0000 1.5
@@ -85,9 +85,7 @@
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
{
Evas_Object *o, *of, *ob;
-
- _fill_data(cfdata);
-
+
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Menu Settings"), 0);
ob = e_widget_check_add(evas, _("Show Name In Menu"),
&(cfdata->menu_eap_name_show));
@@ -109,22 +107,14 @@
e_config->menu_eap_comment_show = cfdata->menu_eap_comment_show;
if (cfdata->menus_scroll_speed == 0)
- {
- e_config->menus_scroll_speed = 1.0;
- }
+ e_config->menus_scroll_speed = 1.0;
else
- {
- e_config->menus_scroll_speed = cfdata->menus_scroll_speed;
- }
+ e_config->menus_scroll_speed = cfdata->menus_scroll_speed;
if (cfdata->menus_fast_mouse_move_threshhold == 0)
- {
- e_config->menus_fast_mouse_move_threshhold = 1.0;
- }
- else
- {
- e_config->menus_fast_mouse_move_threshhold =
cfdata->menus_fast_mouse_move_threshhold;
- }
+ e_config->menus_fast_mouse_move_threshhold = 1.0;
+ else
+ e_config->menus_fast_mouse_move_threshhold =
cfdata->menus_fast_mouse_move_threshhold;
e_config->menus_click_drag_timeout = cfdata->menus_click_drag_timeout;
e_config->menu_autoscroll_margin = cfdata->menu_autoscroll_margin;
@@ -139,8 +129,6 @@
{
Evas_Object *o, *of, *ob;
- _fill_data(cfdata);
-
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Menu Settings"), 0);
ob = e_widget_check_add(evas, _("Show Name In Menu"),
&(cfdata->menu_eap_name_show));
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_performance.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_config_performance.c 22 Jan 2006 14:12:17 -0000 1.5
+++ e_int_config_performance.c 13 Feb 2006 15:36:56 -0000 1.6
@@ -55,6 +55,7 @@
E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
+ _fill_data(cfdata);
return cfdata;
}
@@ -79,8 +80,6 @@
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
{
Evas_Object *o, *of, *ob;
-
- _fill_data(cfdata);
o = e_widget_list_add(evas, 0, 0);
@@ -115,8 +114,6 @@
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ob, *of;
-
- _fill_data(cfdata);
o = e_widget_list_add(evas, 0, 0);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_startup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_int_config_startup.c 25 Jan 2006 04:03:12 -0000 1.1
+++ e_int_config_startup.c 13 Feb 2006 15:36:56 -0000 1.2
@@ -39,6 +39,7 @@
E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
+ _fill_data(cfdata);
return cfdata;
}
@@ -63,8 +64,6 @@
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
{
Evas_Object *o, *of, *ob;
-
- _fill_data(cfdata);
o = e_widget_list_add(evas, 0, 0);
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_window_display.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_int_config_window_display.c 4 Feb 2006 01:07:04 -0000 1.10
+++ e_int_config_window_display.c 13 Feb 2006 15:36:56 -0000 1.11
@@ -137,8 +137,6 @@
Evas_Object *o, *of, *ob;
E_Radio_Group *rg;
- _fill_data(cfdata);
-
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Display"), 0);
@@ -170,8 +168,6 @@
Evas_Object *o, *ob, *of;
E_Radio_Group *rg;
- _fill_data(cfdata);
-
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Window Move Geometry"), 0);
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_window_manipulation.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_config_window_manipulation.c 22 Jan 2006 14:12:17 -0000 1.5
+++ e_int_config_window_manipulation.c 13 Feb 2006 15:36:56 -0000 1.6
@@ -126,8 +126,6 @@
Evas_Object *o, *of, *ob;
E_Radio_Group *rg;
- _fill_data(cfdata);
-
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Miscellaneous Options"), 0);
@@ -159,8 +157,6 @@
Evas_Object *o, *ob, *of;
E_Radio_Group *rg;
- _fill_data(cfdata);
-
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Autoraise"), 0);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_winlist.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_int_config_winlist.c 2 Feb 2006 06:55:39 -0000 1.6
+++ e_int_config_winlist.c 13 Feb 2006 15:36:56 -0000 1.7
@@ -83,6 +83,7 @@
E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
+ _fill_data(cfdata);
return cfdata;
}
@@ -116,8 +117,6 @@
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
{
Evas_Object *o, *of, *ob;
-
- _fill_data(cfdata);
o = e_widget_list_add(evas, 0, 0);
@@ -188,8 +187,6 @@
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *of, *ob, *ot;
-
- _fill_data(cfdata);
o = e_widget_list_add(evas, 0, 0);
ot = e_widget_table_add(evas, 0);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
