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 000000000..a59e24c61 Binary files /dev/null and b/src/modules/conf_applications/e-module-conf_applications.edj differ diff --git a/src/bin/e_int_config_apps.c b/src/modules/conf_applications/e_int_config_apps.c similarity index 100% rename from src/bin/e_int_config_apps.c rename to src/modules/conf_applications/e_int_config_apps.c diff --git a/src/bin/e_int_config_apps.h b/src/modules/conf_applications/e_int_config_apps.h similarity index 100% rename from src/bin/e_int_config_apps.h rename to src/modules/conf_applications/e_int_config_apps.h diff --git a/src/modules/conf_applications/e_mod_main.c b/src/modules/conf_applications/e_mod_main.c new file mode 100644 index 000000000..75a28c3dc --- /dev/null +++ b/src/modules/conf_applications/e_mod_main.c @@ -0,0 +1,78 @@ +/* + * 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 - 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