Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/fileman
Modified Files:
e_mod_config.c e_mod_config.h e_mod_main.c
Log Message:
Add Fileman config to Configuration Panel when module loaded.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/fileman/e_mod_config.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_mod_config.c 12 Aug 2007 23:34:30 -0000 1.4
+++ e_mod_config.c 13 Aug 2007 00:00:13 -0000 1.5
@@ -68,13 +68,13 @@
static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
-void
-_config_fileman_module(E_Container *con)
+EAPI E_Config_Dialog *
+e_int_config_fileman(E_Container *con, const char *params __UNUSED__)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
- if (e_config_dialog_find("E", "_config_fileman_dialog")) return;
+ if (e_config_dialog_find("E", "_config_fileman_dialog")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
v->free_cfdata = _free_data;
@@ -83,6 +83,7 @@
cfd = e_config_dialog_new(con, _("Fileman Settings"), "E",
"_config_fileman_dialog",
"enlightenment/fileman", 0, v, NULL);
+ return cfd;
}
static void *
@@ -91,6 +92,8 @@
E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
+ cfd->cfdata = cfdata;
+ cfdata->cfd = cfd;
_fill_data(cfdata);
return cfdata;
}
@@ -112,6 +115,7 @@
static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
+ E_FREE(cfd->data);
E_FREE(cfdata);
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/fileman/e_mod_config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_config.h 12 Aug 2007 09:54:33 -0000 1.1
+++ e_mod_config.h 13 Aug 2007 00:00:13 -0000 1.2
@@ -4,7 +4,7 @@
#ifndef E_MOD_CONFIG_H
#define E_MOD_CONFIG_H
-void _config_fileman_module(E_Container *con);
+EAPI E_Config_Dialog *e_int_config_fileman(E_Container *con, const char
*params __UNUSED__);
#endif
#endif
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/fileman/e_mod_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.c 12 Aug 2007 23:04:38 -0000 1.3
+++ e_mod_main.c 13 Aug 2007 00:00:13 -0000 1.4
@@ -3,6 +3,7 @@
*/
#include "e.h"
#include "e_mod_main.h"
+#include "e_mod_config.h"
/* actual module specifics */
static void _e_mod_action_fileman_cb(E_Object *obj, const char *params);
@@ -34,6 +35,13 @@
conf_module = m;
+ /* Setup Entry in Config Panel */
+ e_configure_registry_category_add("fileman", 100, _("File Manager"),
+ NULL, "enlightenment/fileman");
+ e_configure_registry_item_add("fileman/fileman", 10, _("File Manager"),
+ NULL, "enlightenment/fileman",
+ e_int_config_fileman);
+
/* Setup Config edd */
_e_mod_fileman_config_load();
@@ -118,6 +126,9 @@
e_action_del("fileman");
act = NULL;
}
+ /* remove fileman category from config panel */
+ e_configure_registry_item_del("fileman/fileman");
+ e_configure_registry_category_del("fileman");
E_FREE(fileman_config);
E_CONFIG_DD_FREE(conf_edd);
@@ -147,7 +158,7 @@
E_Container *con;
con = e_container_current_get(e_manager_current_get());
- _config_fileman_module(con);
+ e_int_config_fileman(con, NULL);
return 1;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
