move more config dialogs to modules.

configure.in

@@ -252,6 +252,12 @@ src/modules/layout/Makefile
 src/modules/layout/module.desktop
 src/modules/conf_wallpaper/Makefile
 src/modules/conf_wallpaper/module.desktop
+src/modules/conf_theme/Makefile
+src/modules/conf_theme/module.desktop
+src/modules/conf_colors/Makefile
+src/modules/conf_colors/module.desktop
+src/modules/conf_fonts/Makefile
+src/modules/conf_fonts/module.desktop
 src/preload/Makefile
 data/Makefile
 data/fonts/Makefile

src/bin/Makefile.am

@@ -119,14 +119,11 @@ e_slider.h \
 e_widget_slider.h \
 e_int_config_window_manipulation.h \
 e_int_config_window_display.h \
-e_int_config_theme.h \
-e_int_config_theme_import.h \
 e_int_config_icon_themes.h \
 e_int_config_menus.h \
 e_int_config_keybindings.h \
 e_int_config_mousebindings.h \
 e_int_config_cursor.h \
-e_int_config_fonts.h \
 e_int_config_startup.h \
 e_int_config_performance.h \
 e_int_config_winlist.h \
@@ -135,7 +132,6 @@ e_int_config_desklock.h \
 e_int_config_exebuf.h \
 e_int_config_apps.h \
 e_int_config_dialogs.h \
-e_int_config_color_classes.h \
 e_int_config_mime.h \
 e_int_config_mime_edit.h \
 e_int_config_screensaver.h \
@@ -279,14 +275,11 @@ e_slider.c \
 e_widget_slider.c \
 e_int_config_window_manipulation.c \
 e_int_config_window_display.c \
-e_int_config_theme.c \
-e_int_config_theme_import.c \
 e_int_config_icon_themes.c \
 e_int_config_menus.c \
 e_int_config_keybindings.c \
 e_int_config_mousebindings.c \
 e_int_config_cursor.c \
-e_int_config_fonts.c \
 e_int_config_startup.c \
 e_int_config_performance.c \
 e_int_config_winlist.c \
@@ -298,7 +291,6 @@ e_int_config_dialogs.c \
 e_int_config_intl.c \
 e_int_config_imc.c \
 e_int_config_imc_import.c \
-e_int_config_color_classes.c \
 e_int_config_mime.c \
 e_int_config_mime_edit.c \
 e_int_config_screensaver.c \

src/bin/e_config.c

@@ -755,6 +755,9 @@ e_config_init(void)
 	CFG_MODULE("temperature", 1);
 	CFG_MODULE("pager", 1);
 	CFG_MODULE("conf_wallpaper", 1);
+	CFG_MODULE("conf_theme", 1);
+	CFG_MODULE("conf_colors", 1);
+	CFG_MODULE("conf_fonts", 1);
      }
 #if 0
      {

src/bin/e_configure.c

@@ -423,9 +423,9 @@ e_configure_init(void)
    /* FIXME: hardcoded - need to move these into modules - except modules config */
    e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance");
 //   e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"), NULL, "enlightenment/background", e_int_config_wallpaper);
-   e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL, "enlightenment/themes", e_int_config_theme);
-   e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL, "enlightenment/colors", e_int_config_color_classes);
-   e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL, "enlightenment/fonts", e_int_config_fonts);
+//   e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL, "enlightenment/themes", e_int_config_theme);
+//   e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL, "enlightenment/colors", e_int_config_color_classes);
+//   e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL, "enlightenment/fonts", e_int_config_fonts);
    e_configure_registry_item_add("appearance/borders", 50, _("Borders"), NULL, "enlightenment/windows", e_int_config_borders);
    e_configure_registry_item_add("appearance/icon_theme", 60, _("Icon Theme"), NULL, "enlightenment/icon_theme", e_int_config_icon_themes);
    e_configure_registry_item_add("appearance/mouse_cursor", 70, _("Mouse Cursor"), NULL, "enlightenment/mouse", e_int_config_cursor);

src/bin/e_includes.h

@@ -88,14 +88,11 @@
 #include "e_widget_slider.h"
 #include "e_int_config_window_manipulation.h"
 #include "e_int_config_window_display.h"
-#include "e_int_config_theme.h"
-#include "e_int_config_theme_import.h"
 #include "e_int_config_icon_themes.h"
 #include "e_int_config_menus.h"
 #include "e_int_config_keybindings.h"
 #include "e_int_config_mousebindings.h"
 #include "e_int_config_cursor.h"
-#include "e_int_config_fonts.h"
 #include "e_int_config_startup.h"
 #include "e_int_config_performance.h"
 #include "e_int_config_winlist.h"
@@ -109,7 +106,6 @@
 #include "e_int_config_intl.h"
 #include "e_int_config_imc.h"
 #include "e_int_config_imc_import.h"
-#include "e_int_config_color_classes.h"
 #include "e_int_config_mime.h"
 #include "e_int_config_mime_edit.h"
 #include "e_exebuf.h"

src/modules/Makefile.am

@@ -10,4 +10,7 @@ cpufreq \
 ibox \
 start \
 layout \
-conf_wallpaper
+conf_wallpaper \
+conf_theme \
+conf_colors \
+conf_fonts

src/modules/conf_colors/.cvsignore

@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop

src/modules/conf_colors/Makefile.am

@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_colors
+
+# 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_color_classes.c \
+			 e_int_config_color_classes.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)

src/modules/conf_colors/e_mod_main.c

@@ -0,0 +1,62 @@
+/*
+ * 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 - Colors"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance");
+   e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL, "enlightenment/colors", e_int_config_color_classes);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   e_configure_registry_item_del("appearance/colors");
+   e_configure_registry_category_del("appearance");
+   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 - Colors"),
+			_("Configuration dialog for colors."));
+   return 1;
+}

src/modules/conf_colors/e_mod_main.h

@@ -0,0 +1,19 @@
+/*
+ * 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_color_classes.h"
+#undef E_TYPEDEFS
+#include "e_int_config_color_classes.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

src/modules/conf_colors/module.desktop.in

@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Colors
+Icon=e-module-conf_colors

src/modules/conf_fonts/.cvsignore

@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop

src/modules/conf_fonts/Makefile.am

@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_fonts
+
+# 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_fonts.c \
+			 e_int_config_fonts.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)

src/modules/conf_fonts/e_mod_main.c

@@ -0,0 +1,62 @@
+/*
+ * 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 - Colors"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance");
+   e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL, "enlightenment/fonts", e_int_config_fonts);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   e_configure_registry_item_del("appearance/fonts");
+   e_configure_registry_category_del("appearance");
+   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 - Fonts"),
+			_("Configuration dialog for fonts."));
+   return 1;
+}

src/modules/conf_fonts/e_mod_main.h

@@ -0,0 +1,19 @@
+/*
+ * 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_fonts.h"
+#undef E_TYPEDEFS
+#include "e_int_config_fonts.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

src/modules/conf_fonts/module.desktop.in

@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Fonts
+Icon=e-module-conf_fonts

src/modules/conf_theme/.cvsignore

@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop

src/modules/conf_theme/Makefile.am

@@ -0,0 +1,33 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_theme
+
+# 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_theme.c \
+			 e_int_config_theme.h \
+			 e_int_config_theme_import.c \
+			 e_int_config_theme_import.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)

src/modules/conf_theme/e_mod_main.c

@@ -0,0 +1,62 @@
+/*
+ * 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 - Theme"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance");
+   e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL, "enlightenment/themes", e_int_config_theme);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   e_configure_registry_item_del("appearance/theme");
+   e_configure_registry_category_del("appearance");
+   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 - Theme"),
+			_("Configuration dialog for theme."));
+   return 1;
+}

src/modules/conf_theme/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_theme.h"
+#include "e_int_config_theme_import.h"
+#undef E_TYPEDEFS
+#include "e_int_config_theme.h"
+#include "e_int_config_theme_import.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

src/modules/conf_theme/module.desktop.in

@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Theme
+Icon=e-module-conf_theme

src/modules/conf_wallpaper/e_mod_main.c

@@ -25,7 +25,7 @@ static E_Module *conf_module = NULL;
 EAPI E_Module_Api e_modapi =
 {
    E_MODULE_API_VERSION,
-     "Configuration - Layout"
+     "Configuration - Wallpaper"
 };
 
 EAPI void *