Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config_dialog.c
Log Message:
Make it a bit more generic.
* Allow NULL apply_cfdata functions.
* Autohide the "Apply" and "OK" buttons if there is no apply_cfdata functions.
* Change the mode switch button text to be more generic.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config_dialog.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_config_dialog.c 17 Jan 2006 20:25:48 -0000 1.16
+++ e_config_dialog.c 21 Jan 2006 11:48:30 -0000 1.17
@@ -32,10 +32,13 @@
cfd->icon_size = icon_size;
}
cfd->data = data;
- cfd->hide_buttons = 0;
-
+ cfd->hide_buttons = 1;
+
+ if ((cfd->view.basic.apply_cfdata) || (cfd->view.advanced.apply_cfdata))
+ cfd->hide_buttons = 0;
+
_e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC);
-
+
return cfd;
}
@@ -85,7 +88,7 @@
ob = cfd->view.basic.create_widgets(cfd,
e_win_evas_get(cfd->dia->win), cfd->cfdata);
e_widget_list_object_append(o, ob, 1, 1, 0.0);
ob = e_widget_button_add(e_win_evas_get(cfd->dia->win),
- _("Advanced Settings"),
"widget/new_dialog",
+ _("Advanced"), "widget/new_dialog",
_e_config_dialog_cb_advanced, cfd, NULL);
e_widget_list_object_append(o, ob, 0, 0, 1.0);
}
@@ -100,7 +103,7 @@
ob = cfd->view.advanced.create_widgets(cfd,
e_win_evas_get(cfd->dia->win), cfd->cfdata);
e_widget_list_object_append(o, ob, 1, 1, 0.0);
ob = e_widget_button_add(e_win_evas_get(cfd->dia->win),
- _("Basic Settings"), "widget/new_dialog",
+ _("Basic"), "widget/new_dialog",
_e_config_dialog_cb_basic, cfd, NULL);
e_widget_list_object_append(o, ob, 0, 0, 1.0);
}
@@ -170,9 +173,15 @@
cfd = dia->data;
if (cfd->view_type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
- ok = cfd->view.basic.apply_cfdata(cfd, cfd->cfdata);
+ {
+ if (cfd->view.basic.apply_cfdata)
+ ok = cfd->view.basic.apply_cfdata(cfd, cfd->cfdata);
+ }
else
- ok = cfd->view.advanced.apply_cfdata(cfd, cfd->cfdata);
+ {
+ if (cfd->view.advanced.apply_cfdata)
+ ok = cfd->view.advanced.apply_cfdata(cfd, cfd->cfdata);
+ }
if (ok) e_object_del(E_OBJECT(cfd));
}
@@ -184,10 +193,16 @@
cfd = dia->data;
if (cfd->view_type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
- ok = cfd->view.basic.apply_cfdata(cfd, cfd->cfdata);
+ {
+ if (cfd->view.basic.apply_cfdata)
+ ok = cfd->view.basic.apply_cfdata(cfd, cfd->cfdata);
+ }
else
- ok = cfd->view.advanced.apply_cfdata(cfd, cfd->cfdata);
- if (ok)
+ {
+ if (cfd->view.advanced.apply_cfdata)
+ ok = cfd->view.advanced.apply_cfdata(cfd, cfd->cfdata);
+ }
+ if ((ok) && (!cfd->hide_buttons))
{
e_dialog_button_disable_num_set(cfd->dia, 0, 1);
e_dialog_button_disable_num_set(cfd->dia, 1, 1);
@@ -218,6 +233,9 @@
E_Config_Dialog *cfd;
cfd = data;
- e_dialog_button_disable_num_set(cfd->dia, 0, 0);
- e_dialog_button_disable_num_set(cfd->dia, 1, 0);
+ if (!cfd->hide_buttons)
+ {
+ e_dialog_button_disable_num_set(cfd->dia, 0, 0);
+ e_dialog_button_disable_num_set(cfd->dia, 1, 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
