Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config_dialog.c e_config_dialog.h e_int_config_focus.c
Log Message:
allwo dialog icon to be set too in conf dialogs
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config_dialog.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_config_dialog.c 14 Oct 2005 09:48:13 -0000 1.5
+++ e_config_dialog.c 15 Oct 2005 03:09:46 -0000 1.6
@@ -17,7 +17,7 @@
/* externally accessible functions */
E_Config_Dialog *
-e_config_dialog_new(E_Container *con, char *title, E_Config_Dialog_View *view,
void *data)
+e_config_dialog_new(E_Container *con, char *title, char *icon, int icon_size,
E_Config_Dialog_View *view, void *data)
{
E_Config_Dialog *cfd;
@@ -25,6 +25,11 @@
cfd->view = *view;
cfd->con = con;
cfd->title = strdup(title);
+ if (icon)
+ {
+ cfd->icon = strdup(icon);
+ cfd->icon_size = icon_size;
+ }
cfd->data = data;
_e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC);
@@ -38,6 +43,7 @@
_e_config_dialog_free(E_Config_Dialog *cfd)
{
E_FREE(cfd->title);
+ E_FREE(cfd->icon);
if (cfd->cfdata)
{
cfd->view.free_cfdata(cfd, cfd->cfdata);
@@ -64,7 +70,8 @@
cfd->dia->data = cfd;
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);
+
if (!cfd->cfdata) cfd->cfdata = cfd->view.create_cfdata(cfd);
if (type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config_dialog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_config_dialog.h 14 Oct 2005 09:48:13 -0000 1.3
+++ e_config_dialog.h 15 Oct 2005 03:09:46 -0000 1.4
@@ -37,11 +37,13 @@
void *cfdata;
E_Container *con;
char *title;
+ char *icon;
+ int icon_size;
E_Dialog *dia;
void *data;
};
-EAPI E_Config_Dialog *e_config_dialog_new(E_Container *con, char *title,
E_Config_Dialog_View *view, void *data);
+EAPI E_Config_Dialog *e_config_dialog_new(E_Container *con, char *title, char
*icon, int icon_size, E_Config_Dialog_View *view, void *data);
#endif
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_focus.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_config_focus.c 14 Oct 2005 09:48:13 -0000 1.3
+++ e_int_config_focus.c 15 Oct 2005 03:09:46 -0000 1.4
@@ -41,7 +41,7 @@
v.advanced.apply_cfdata = _advanced_apply_data;
v.advanced.create_widgets = _advanced_create_widgets;
/* create config diaolg for NULL object/data */
- cfd = e_config_dialog_new(con, _("Focus Settings"), &v, NULL);
+ cfd = e_config_dialog_new(con, _("Focus Settings"), NULL, 0, &v, NULL);
}
/**--CREATE--**/
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
