From ae480c262137ac1acae5e8d0fc82ad68a6254000 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 24 Jul 2007 14:50:26 +0000 Subject: [PATCH] move apps configs to module SVN revision: 30952 --- configure.in | 2 + src/bin/Makefile.am | 2 - src/bin/e_config.c | 1 + src/bin/e_configure.c | 16 ++-- src/modules/Makefile.am | 3 +- src/modules/conf_applications/.cvsignore | 7 ++ src/modules/conf_applications/Makefile.am | 31 +++++++ .../e-module-conf_applications.edj | Bin 0 -> 3634 bytes .../conf_applications}/e_int_config_apps.c | 0 .../conf_applications}/e_int_config_apps.h | 0 src/modules/conf_applications/e_mod_main.c | 78 ++++++++++++++++++ src/modules/conf_applications/e_mod_main.h | 21 +++++ .../conf_applications/module.desktop.in | 4 + 13 files changed, 154 insertions(+), 11 deletions(-) create mode 100644 src/modules/conf_applications/.cvsignore create mode 100644 src/modules/conf_applications/Makefile.am create mode 100644 src/modules/conf_applications/e-module-conf_applications.edj rename src/{bin => modules/conf_applications}/e_int_config_apps.c (100%) rename src/{bin => modules/conf_applications}/e_int_config_apps.h (100%) create mode 100644 src/modules/conf_applications/e_mod_main.c create mode 100644 src/modules/conf_applications/e_mod_main.h create mode 100644 src/modules/conf_applications/module.desktop.in diff --git a/configure.in b/configure.in index 323703686..2b9f00078 100644 --- a/configure.in +++ b/configure.in @@ -274,6 +274,8 @@ src/modules/conf_imc/Makefile src/modules/conf_imc/module.desktop src/modules/conf_profiles/Makefile src/modules/conf_profiles/module.desktop +src/modules/conf_applications/Makefile +src/modules/conf_applications/module.desktop src/preload/Makefile data/Makefile data/fonts/Makefile diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 6e1a6c3a0..583cecfa2 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -124,7 +124,6 @@ e_int_config_winlist.h \ e_int_config_display.h \ e_int_config_desklock.h \ e_int_config_exebuf.h \ -e_int_config_apps.h \ e_int_config_dialogs.h \ e_int_config_mime.h \ e_int_config_mime_edit.h \ @@ -275,7 +274,6 @@ e_int_config_winlist.c \ e_int_config_display.c \ e_int_config_desklock.c \ e_int_config_exebuf.c \ -e_int_config_apps.c \ e_int_config_dialogs.c \ e_int_config_mime.c \ e_int_config_mime_edit.c \ diff --git a/src/bin/e_config.c b/src/bin/e_config.c index ff9c554bd..e0f57622b 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -765,6 +765,7 @@ e_config_init(void) CFG_MODULE("conf_mouse_cursor", 1); CFG_MODULE("conf_transitions", 1); CFG_MODULE("conf_startup", 1); + CFG_MODULE("conf_applications", 1); } #if 0 { diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c index 9b046c212..7a1a591a5 100644 --- a/src/bin/e_configure.c +++ b/src/bin/e_configure.c @@ -432,11 +432,11 @@ e_configure_init(void) // e_configure_registry_item_add("appearance/transitions", 80, _("Transitions"), NULL, "enlightenment/transitions", e_int_config_transitions); // e_configure_registry_item_add("appearance/startup", 90, _("Startup"), NULL, "enlightenment/startup", e_int_config_startup); - e_configure_registry_category_add("applications", 20, _("Applications"), NULL, "enlightenment/applications"); - e_configure_registry_item_add("applications/new_application", 10, _("New Application"), NULL, "enlightenment/add_application", e_int_config_apps_add); - e_configure_registry_item_add("applications/ibar_applications", 20, _("IBar Applications"), NULL, "enlightenment/ibar_applications", e_int_config_apps_ibar); - e_configure_registry_item_add("applications/restart_applications", 30, _("Restart Applications"), NULL, "enlightenment/restart_applications", e_int_config_apps_restart); - e_configure_registry_item_add("applications/startup_applications", 40, _("Startup Applications"), NULL, "enlightenment/startup_applications", e_int_config_apps_startup); +// e_configure_registry_category_add("applications", 20, _("Applications"), NULL, "enlightenment/applications"); +// e_configure_registry_item_add("applications/new_application", 10, _("New Application"), NULL, "enlightenment/add_application", e_int_config_apps_add); +// e_configure_registry_item_add("applications/ibar_applications", 20, _("IBar Applications"), NULL, "enlightenment/ibar_applications", e_int_config_apps_ibar); +// e_configure_registry_item_add("applications/restart_applications", 30, _("Restart Applications"), NULL, "enlightenment/restart_applications", e_int_config_apps_restart); +// e_configure_registry_item_add("applications/startup_applications", 40, _("Startup Applications"), NULL, "enlightenment/startup_applications", e_int_config_apps_startup); e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "enlightenment/screen_setup"); e_configure_registry_item_add("screen/virtual_desktops", 10, _("Virtual Desktops"), NULL, "enlightenment/desktops", e_int_config_desks); @@ -456,9 +456,9 @@ e_configure_init(void) 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_item_add("menus/favorites_menu", 10, _("Favorites Menu"), NULL, "enlightenment/favorites", e_int_config_apps_favs); +// 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); +// 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); @@ -484,7 +484,7 @@ e_configure_init(void) // e_configure_registry_item_add("internal/borders_border", -1, _("Border"), NULL, "enlightenment/windows", e_int_config_borders_border); // e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"), NULL, "enlightenment/windows", e_int_config_wallpaper_desk); e_configure_registry_item_add("internal/desk", -1, _("Desk"), NULL, "enlightenment/windows", e_int_config_desk); - e_configure_registry_item_add("internal/ibar_other", -1, _("IBar Other"), NULL, "enlightenment/windows", e_int_config_apps_ibar_other); +// e_configure_registry_item_add("internal/ibar_other", -1, _("IBar Other"), NULL, "enlightenment/windows", e_int_config_apps_ibar_other); } static void diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index fe893b55e..cc0017ce0 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am @@ -21,4 +21,5 @@ conf_transitions \ conf_startup \ conf_intl \ conf_imc \ -conf_profiles +conf_profiles \ +conf_applications diff --git a/src/modules/conf_applications/.cvsignore b/src/modules/conf_applications/.cvsignore new file mode 100644 index 000000000..06d064a84 --- /dev/null +++ b/src/modules/conf_applications/.cvsignore @@ -0,0 +1,7 @@ +.deps +.libs +Makefile +Makefile.in +*.lo +module.la +module.desktop diff --git a/src/modules/conf_applications/Makefile.am b/src/modules/conf_applications/Makefile.am new file mode 100644 index 000000000..d11e57b2c --- /dev/null +++ b/src/modules/conf_applications/Makefile.am @@ -0,0 +1,31 @@ +MAINTAINERCLEANFILES = Makefile.in +MODULE = conf_applications + +# 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_apps.c \ + e_int_config_apps.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_applications/e-module-conf_applications.edj b/src/modules/conf_applications/e-module-conf_applications.edj new file mode 100644 index 0000000000000000000000000000000000000000..a59e24c6146505f8689ae61e1dbed188d8aa49b8 GIT binary patch literal 3634 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 + */ +#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 - Applications" +}; + +EAPI void * +e_modapi_init(E_Module *m) +{ + e_configure_registry_category_add("applications", 20, _("Applications"), NULL, "enlightenment/applications"); + e_configure_registry_item_add("applications/new_application", 10, _("New Application"), NULL, "enlightenment/add_application", e_int_config_apps_add); + e_configure_registry_item_add("applications/ibar_applications", 20, _("IBar Applications"), NULL, "enlightenment/ibar_applications", e_int_config_apps_ibar); + e_configure_registry_item_add("applications/restart_applications", 30, _("Restart Applications"), NULL, "enlightenment/restart_applications", e_int_config_apps_restart); + e_configure_registry_item_add("applications/startup_applications", 40, _("Startup Applications"), NULL, "enlightenment/startup_applications", e_int_config_apps_startup); + e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal"); + e_configure_registry_item_add("internal/ibar_other", -1, _("IBar Other"), NULL, "enlightenment/windows", e_int_config_apps_ibar_other); + 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); + 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_apps_dialog"))) e_object_del(E_OBJECT(cfd)); + e_configure_registry_item_del("menus/favorites_menu"); + e_configure_registry_category_del("menus"); + e_configure_registry_item_del("internal/ibar_other"); + e_configure_registry_category_del("internal"); + e_configure_registry_item_del("applications/new_application"); + e_configure_registry_item_del("applications/ibar_applications"); + e_configure_registry_item_del("applications/restart_applications"); + e_configure_registry_item_del("applications/startup_applications"); + e_configure_registry_category_del("applications"); + 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 - Applications"), + _("Configuration dialog for applications.")); + return 1; +} diff --git a/src/modules/conf_applications/e_mod_main.h b/src/modules/conf_applications/e_mod_main.h new file mode 100644 index 000000000..f7bc47ff5 --- /dev/null +++ b/src/modules/conf_applications/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_apps.h" + +#undef E_TYPEDEFS +#include "e_int_config_apps.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_applications/module.desktop.in b/src/modules/conf_applications/module.desktop.in new file mode 100644 index 000000000..808a74295 --- /dev/null +++ b/src/modules/conf_applications/module.desktop.in @@ -0,0 +1,4 @@ +[Desktop Entry] +Type=Link +Name=Configuration - Applications +Icon=e-module-conf_applications