and more config into modules

SVN revision: 31058

23 files changed, 290 insertions, 38 deletions

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index c709138300..445b9e7ea6 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -112,7 +112,6 @@ e_widget_tlist.h \
 e_widget_config_list.h \
 e_slider.h \
 e_widget_slider.h \
-e_int_config_menus.h \
 e_int_config_performance.h \
 e_int_config_winlist.h \
 e_int_config_exebuf.h \
@@ -155,7 +154,6 @@ e_fwin.h \
 e_widget_aspect.h \
 e_filereg.h \
 e_widget_desk_preview.h \
-e_int_config_clientlist.h \
 e_fm_prop.h \
 e_mouse.h \
 e_order.h \
@@ -249,7 +247,6 @@ e_widget_tlist.c \
 e_widget_config_list.c \
 e_slider.c \
 e_widget_slider.c \
-e_int_config_menus.c \
 e_int_config_performance.c \
 e_int_config_winlist.c \
 e_int_config_exebuf.c \
@@ -293,7 +290,6 @@ e_widget_aspect.c \
 e_widget_desk_preview.c \
 e_filereg.c \
 e_fm_prop.c \
-e_int_config_clientlist.c \
 e_mouse.c \
 e_order.c \
 e_exec.c \
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 91cedd858c..b49681f523 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -779,6 +779,8 @@ e_config_init(void)
 	CFG_MODULE("conf_window_display", 1);
 	CFG_MODULE("conf_window_focus", 1);
 	CFG_MODULE("conf_window_manipulation", 1);
+	CFG_MODULE("conf_menus", 1);
+	CFG_MODULE("conf_clientlist", 1);
      }
 #if 0
      {
diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c
index 14cbf3c514..1070795662 100644
--- a/src/bin/e_configure.c
+++ b/src/bin/e_configure.c
@@ -455,13 +455,13 @@ e_configure_init(void)
 //   e_configure_registry_item_add("windows/window_focus", 20, _("Window Focus"), NULL, "enlightenment/focus", e_int_config_focus);
 //   e_configure_registry_item_add("windows/window_manipulation", 30, _("Window Manipulation"), NULL, "enlightenment/window_manipulation", e_int_config_window_manipulation);
    
-   e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "enlightenment/menus");
+//   e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "enlightenment/menus");
 ////   e_configure_registry_item_add("menus/favorites_menu", 10, _("Favorites Menu"), NULL, "enlightenment/favorites", e_int_config_apps_favs);   
 #if 0
 ////   e_configure_registry_item_add("menus/applications_menu", 20, _("Application Menus"), NULL, "enlightenment/applications", e_int_config_apps);
 #endif
-   e_configure_registry_item_add("menus/menu_settings", 30, _("Menu Settings"), NULL, "enlightenment/menu_settings", e_int_config_menus);
-   e_configure_registry_item_add("menus/client_list_menu", 40, _("Client List Menu"), NULL, "enlightenment/windows", e_int_config_clientlist);
+//   e_configure_registry_item_add("menus/menu_settings", 30, _("Menu Settings"), NULL, "enlightenment/menu_settings", e_int_config_menus);
+//   e_configure_registry_item_add("menus/client_list_menu", 40, _("Client List Menu"), NULL, "enlightenment/windows", e_int_config_clientlist);
    
    e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
    e_configure_registry_item_add("advanced/dialogs", 10, _("Dialogs"), NULL, "enlightenment/configuration", e_int_config_dialogs);
diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 6cc2974d83..36fe7d9863 100644
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -84,7 +84,6 @@
 #include "e_widget_config_list.h"
 #include "e_slider.h"
 #include "e_widget_slider.h"
-#include "e_int_config_menus.h"
 #include "e_int_config_performance.h"
 #include "e_int_config_winlist.h"
 #include "e_int_config_exebuf.h"
@@ -130,7 +129,6 @@
 #include "e_filereg.h"
 #include "e_widget_aspect.h"
 #include "e_widget_desk_preview.h"
-#include "e_int_config_clientlist.h"
 #include "e_fm_prop.h"
 #include "e_mouse.h"
 #include "e_order.h"
diff --git a/src/bin/e_int_config_clientlist.h b/src/bin/e_int_config_clientlist.h
deleted file mode 100644
index 6a0ae50078..0000000000
--- a/src/bin/e_int_config_clientlist.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_CLIENTLIST_H
-#define E_INT_CONFIG_CLIENTLIST_H
-
-#define E_CLIENTLIST_GROUP_NONE 0
-#define E_CLIENTLIST_GROUP_DESK 1
-#define E_CLIENTLIST_GROUP_CLASS 2
-
-#define E_CLIENTLIST_GROUP_SEP_NONE 0
-#define E_CLIENTLIST_GROUP_SEP_BAR 1
-#define E_CLIENTLIST_GROUP_SEP_MENU 2
-
-#define E_CLIENTLIST_SORT_NONE 0  
-#define E_CLIENTLIST_SORT_ALPHA 1
-#define E_CLIENTLIST_SORT_ZORDER 2
-#define E_CLIENTLIST_SORT_MOST_RECENT 3
-
-#define E_CLIENTLIST_GROUPICONS_OWNER 0
-#define E_CLIENTLIST_GROUPICONS_CURRENT 1
-#define E_CLIENTLIST_GROUPICONS_SEP 2
-
-#define E_CLIENTLIST_MAX_CAPTION_LEN 256
-
-EAPI E_Config_Dialog *e_int_config_clientlist(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/bin/e_int_menus.h b/src/bin/e_int_menus.h
index 440c3c6d33..865345f933 100644
--- a/src/bin/e_int_menus.h
+++ b/src/bin/e_int_menus.h
@@ -9,6 +9,25 @@ typedef struct _E_Int_Menu_Augmentation E_Int_Menu_Augmentation;
 #ifndef E_INT_MENUS_H
 #define E_INT_MENUS_H
 
+#define E_CLIENTLIST_GROUP_NONE 0
+#define E_CLIENTLIST_GROUP_DESK 1
+#define E_CLIENTLIST_GROUP_CLASS 2
+
+#define E_CLIENTLIST_GROUP_SEP_NONE 0
+#define E_CLIENTLIST_GROUP_SEP_BAR 1
+#define E_CLIENTLIST_GROUP_SEP_MENU 2
+
+#define E_CLIENTLIST_SORT_NONE 0
+#define E_CLIENTLIST_SORT_ALPHA 1
+#define E_CLIENTLIST_SORT_ZORDER 2
+#define E_CLIENTLIST_SORT_MOST_RECENT 3
+
+#define E_CLIENTLIST_GROUPICONS_OWNER 0
+#define E_CLIENTLIST_GROUPICONS_CURRENT 1
+#define E_CLIENTLIST_GROUPICONS_SEP 2
+
+#define E_CLIENTLIST_MAX_CAPTION_LEN 256
+
 struct _E_Int_Menu_Augmentation
 {
    struct {
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 76f5bb71b2..308e331b61 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -35,4 +35,6 @@ conf_mousebindings \
 conf_mouse \
 conf_window_display \
 conf_window_focus \
-conf_window_manipulation
+conf_window_manipulation \
+conf_menus \
+conf_clientlist
diff --git a/src/modules/conf_clientlist/.cvsignore b/src/modules/conf_clientlist/.cvsignore
new file mode 100644
index 0000000000..06d064a845
--- /dev/null
+++ b/src/modules/conf_clientlist/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_clientlist/Makefile.am b/src/modules/conf_clientlist/Makefile.am
new file mode 100644
index 0000000000..b9bdd1a80a
--- /dev/null
+++ b/src/modules/conf_clientlist/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_clientlist
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h \
+			 e_int_config_clientlist.c \
+                         e_int_config_clientlist.h                         
+			 
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_clientlist/e-module-conf_clientlist.edj b/src/modules/conf_clientlist/e-module-conf_clientlist.edj
new file mode 100644
index 0000000000..a59e24c614
--- /dev/null
+++ b/src/modules/conf_clientlist/e-module-conf_clientlist.edj
diff --git a/src/bin/e_int_config_clientlist.c b/src/modules/conf_clientlist/e_int_config_clientlist.c
index 55e363a3dc..55e363a3dc 100644
--- a/src/bin/e_int_config_clientlist.c
+++ b/src/modules/conf_clientlist/e_int_config_clientlist.c
diff --git a/src/modules/conf_clientlist/e_int_config_clientlist.h b/src/modules/conf_clientlist/e_int_config_clientlist.h
new file mode 100644
index 0000000000..1ba0afa146
--- /dev/null
+++ b/src/modules/conf_clientlist/e_int_config_clientlist.h
@@ -0,0 +1,9 @@
+#ifdef E_TYPEDEFS
+#else
+#ifndef E_INT_CONFIG_CLIENTLIST_H
+#define E_INT_CONFIG_CLIENTLIST_H
+
+EAPI E_Config_Dialog *e_int_config_clientlist(E_Container *con, const char *params __UNUSED__);
+
+#endif
+#endif
diff --git a/src/modules/conf_clientlist/e_mod_main.c b/src/modules/conf_clientlist/e_mod_main.c
new file mode 100644
index 0000000000..2cca64ab7b
--- /dev/null
+++ b/src/modules/conf_clientlist/e_mod_main.c
@@ -0,0 +1,64 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/***************************************************************************/
+/**/
+/* actual module specifics */
+
+static E_Module *conf_module = NULL;
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+     "Configuration - Client List Menu"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "enlightenment/menus");
+   e_configure_registry_item_add("menus/client_list_menu", 40, _("Client List Menu"), NULL, "enlightenment/windows", e_int_config_clientlist);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   E_Config_Dialog *cfd;
+   while ((cfd = e_config_dialog_get("E", "_config_clientlist_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("menus/client_list_menu");
+   e_configure_registry_category_del("menus");
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+   e_module_dialog_show(m,
+			_("Enlightenment Configuration Module - Client List Menu"),
+			_("Configuration dialog for client list menu."));
+   return 1;
+}
diff --git a/src/modules/conf_clientlist/e_mod_main.h b/src/modules/conf_clientlist/e_mod_main.h
new file mode 100644
index 0000000000..74dfb67713
--- /dev/null
+++ b/src/modules/conf_clientlist/e_mod_main.h
@@ -0,0 +1,21 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_clientlist.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_clientlist.h"
+
+
+EAPI extern E_Module_Api e_modapi;
+
+EAPI void *e_modapi_init     (E_Module *m);
+EAPI int   e_modapi_shutdown (E_Module *m);
+EAPI int   e_modapi_save     (E_Module *m);
+EAPI int   e_modapi_about    (E_Module *m);
+
+#endif
diff --git a/src/modules/conf_clientlist/module.desktop.in b/src/modules/conf_clientlist/module.desktop.in
new file mode 100644
index 0000000000..fa31445bf2
--- /dev/null
+++ b/src/modules/conf_clientlist/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Client List Menu
+Icon=e-module-conf_clientlist
diff --git a/src/modules/conf_menus/.cvsignore b/src/modules/conf_menus/.cvsignore
new file mode 100644
index 0000000000..06d064a845
--- /dev/null
+++ b/src/modules/conf_menus/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_menus/Makefile.am b/src/modules/conf_menus/Makefile.am
new file mode 100644
index 0000000000..931402e88f
--- /dev/null
+++ b/src/modules/conf_menus/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_menus
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h \
+			 e_int_config_menus.c \
+                         e_int_config_menus.h                         
+			 
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_menus/e-module-conf_menus.edj b/src/modules/conf_menus/e-module-conf_menus.edj
new file mode 100644
index 0000000000..a59e24c614
--- /dev/null
+++ b/src/modules/conf_menus/e-module-conf_menus.edj
diff --git a/src/bin/e_int_config_menus.c b/src/modules/conf_menus/e_int_config_menus.c
index 3b1975c11f..3b1975c11f 100644
--- a/src/bin/e_int_config_menus.c
+++ b/src/modules/conf_menus/e_int_config_menus.c
diff --git a/src/bin/e_int_config_menus.h b/src/modules/conf_menus/e_int_config_menus.h
index 194f0d0439..194f0d0439 100644
--- a/src/bin/e_int_config_menus.h
+++ b/src/modules/conf_menus/e_int_config_menus.h
diff --git a/src/modules/conf_menus/e_mod_main.c b/src/modules/conf_menus/e_mod_main.c
new file mode 100644
index 0000000000..d7d7ba9453
--- /dev/null
+++ b/src/modules/conf_menus/e_mod_main.c
@@ -0,0 +1,64 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/***************************************************************************/
+/**/
+/* actual module specifics */
+
+static E_Module *conf_module = NULL;
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+     "Configuration - Menu Settings"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "enlightenment/menus");
+   e_configure_registry_item_add("menus/menu_settings", 30, _("Menu Settings"), NULL, "enlightenment/menu_settings", e_int_config_menus);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   E_Config_Dialog *cfd;
+   while ((cfd = e_config_dialog_get("E", "_config_menus_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("menus/menu_settings");
+   e_configure_registry_category_del("menus");
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+   e_module_dialog_show(m,
+			_("Enlightenment Configuration Module - Menu Settings"),
+			_("Configuration dialog for menus settings."));
+   return 1;
+}
diff --git a/src/modules/conf_menus/e_mod_main.h b/src/modules/conf_menus/e_mod_main.h
new file mode 100644
index 0000000000..8000b88cdb
--- /dev/null
+++ b/src/modules/conf_menus/e_mod_main.h
@@ -0,0 +1,21 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_menus.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_menus.h"
+
+
+EAPI extern E_Module_Api e_modapi;
+
+EAPI void *e_modapi_init     (E_Module *m);
+EAPI int   e_modapi_shutdown (E_Module *m);
+EAPI int   e_modapi_save     (E_Module *m);
+EAPI int   e_modapi_about    (E_Module *m);
+
+#endif
diff --git a/src/modules/conf_menus/module.desktop.in b/src/modules/conf_menus/module.desktop.in
new file mode 100644
index 0000000000..3485bae3aa
--- /dev/null
+++ b/src/modules/conf_menus/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Menu Settings
+Icon=e-module-conf_menus