diff --git a/config/minimalist/e.src b/config/minimalist/e.src index d9deaf087..7d3c020ca 100644 --- a/config/minimalist/e.src +++ b/config/minimalist/e.src @@ -257,14 +257,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_winlist"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_engine"; diff --git a/config/netbook/e.src b/config/netbook/e.src index 807c81105..e7c310551 100644 --- a/config/netbook/e.src +++ b/config/netbook/e.src @@ -289,14 +289,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_winlist"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_engine"; diff --git a/config/scaleable/e.src b/config/scaleable/e.src index 7e124fd24..368c8d69a 100644 --- a/config/scaleable/e.src +++ b/config/scaleable/e.src @@ -80,14 +80,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_winlist"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_window_manipulation"; diff --git a/config/standard/e.src b/config/standard/e.src index 57b63f2d6..889227fb0 100644 --- a/config/standard/e.src +++ b/config/standard/e.src @@ -80,14 +80,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_winlist"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_window_manipulation"; diff --git a/configure.ac b/configure.ac index 9b0b7c2c2..6d1da69f6 100644 --- a/configure.ac +++ b/configure.ac @@ -701,7 +701,6 @@ AC_E_OPTIONAL_MODULE([conf_window_manipulation], true) AC_E_OPTIONAL_MODULE([conf_menus], true) AC_E_OPTIONAL_MODULE([conf_dialogs], true) AC_E_OPTIONAL_MODULE([conf_performance], true) -AC_E_OPTIONAL_MODULE([conf_winlist], true) AC_E_OPTIONAL_MODULE([conf_paths], true) AC_E_OPTIONAL_MODULE([conf_mime], true) AC_E_OPTIONAL_MODULE([conf_interaction], true) @@ -832,8 +831,6 @@ src/modules/conf_dialogs/Makefile src/modules/conf_dialogs/module.desktop src/modules/conf_performance/Makefile src/modules/conf_performance/module.desktop -src/modules/conf_winlist/Makefile -src/modules/conf_winlist/module.desktop src/modules/conf_paths/Makefile src/modules/conf_paths/module.desktop src/modules/conf_mime/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index c65bf6901..31cc9b65d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -204,8 +204,6 @@ src/modules/conf_window_manipulation/e_int_config_window_stacking.c src/modules/conf_window_manipulation/e_mod_main.c src/modules/conf_window_remembers/e_int_config_remembers.c src/modules/conf_window_remembers/e_mod_main.c -src/modules/conf_winlist/e_int_config_winlist.c -src/modules/conf_winlist/e_mod_main.c src/modules/cpufreq/e_mod_main.c src/modules/cpufreq/freqset.c src/modules/dropshadow/e_mod_config.c @@ -230,6 +228,7 @@ src/modules/fileman_opinfo/e_mod_main.c src/modules/gadman/e_mod_config.c src/modules/gadman/e_mod_gadman.c src/modules/gadman/e_mod_main.c +src/modules/winlist/e_int_config_winlist.c src/modules/winlist/e_mod_main.c src/modules/winlist/e_winlist.c src/modules/ibar/e_mod_config.c diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index 9f977afda..1d2cdb8b6 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am @@ -158,10 +158,6 @@ if USE_MODULE_CONF_PERFORMANCE SUBDIRS += conf_performance endif -if USE_MODULE_CONF_WINLIST -SUBDIRS += conf_winlist -endif - if USE_MODULE_CONF_PATHS SUBDIRS += conf_paths endif diff --git a/src/modules/conf_winlist/.cvsignore b/src/modules/conf_winlist/.cvsignore deleted file mode 100644 index 06d064a84..000000000 --- a/src/modules/conf_winlist/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -module.la -module.desktop diff --git a/src/modules/conf_winlist/Makefile.am b/src/modules/conf_winlist/Makefile.am deleted file mode 100644 index 3811a225f..000000000 --- a/src/modules/conf_winlist/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = conf_winlist - -# 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_builddir)/src/bin \ - -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_winlist.c \ - e_int_config_winlist.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_winlist/e-module-conf_winlist.edj b/src/modules/conf_winlist/e-module-conf_winlist.edj deleted file mode 100644 index 25fba8aac..000000000 Binary files a/src/modules/conf_winlist/e-module-conf_winlist.edj and /dev/null differ diff --git a/src/modules/conf_winlist/e_mod_main.c b/src/modules/conf_winlist/e_mod_main.c deleted file mode 100644 index d023594fb..000000000 --- a/src/modules/conf_winlist/e_mod_main.c +++ /dev/null @@ -1,44 +0,0 @@ -#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, - "Settings - Window List" -}; - -EAPI void * -e_modapi_init(E_Module *m) -{ - e_configure_registry_category_add("windows", 50, _("Windows"), NULL, - "preferences-system-windows"); - e_configure_registry_item_add("windows/window_list", 30, _("Window List"), - NULL, "preferences-winlist", - e_int_config_winlist); - conf_module = m; - e_module_delayed_set(m, 1); - return m; -} - -EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) -{ - E_Config_Dialog *cfd; - - while ((cfd = e_config_dialog_get("E", "advanced/window_list"))) - e_object_del(E_OBJECT(cfd)); - e_configure_registry_item_del("advanced/window_list"); - e_configure_registry_category_del("advanced"); - conf_module = NULL; - return 1; -} - -EAPI int -e_modapi_save(E_Module *m __UNUSED__) -{ - return 1; -} diff --git a/src/modules/conf_winlist/e_mod_main.h b/src/modules/conf_winlist/e_mod_main.h deleted file mode 100644 index d506da5d9..000000000 --- a/src/modules/conf_winlist/e_mod_main.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef E_MOD_MAIN_H -#define E_MOD_MAIN_H - -#define E_TYPEDEFS 1 -#include "e_int_config_winlist.h" - -#undef E_TYPEDEFS -#include "e_int_config_winlist.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); - -#endif diff --git a/src/modules/conf_winlist/module.desktop.in b/src/modules/conf_winlist/module.desktop.in deleted file mode 100644 index ca07c660b..000000000 --- a/src/modules/conf_winlist/module.desktop.in +++ /dev/null @@ -1,34 +0,0 @@ -[Desktop Entry] -Type=Link -Name=Window List -Name[ru]=Список окон -Name[cs]=Seznam oken -Name[de]= -Name[eo]=Fenestrolisto -Name[es]=Lista de ventanas -Name[fr]=Liste des fenêtres -Name[hu]=Ablak lista -Name[it]=Lista finestre -Name[ja]= -Name[pt]=Lista de janelas -Name[pt_BR]= -Name[tr]=Pencere Listesi -Name[zh_CN]= -Name[zh_TW]= -Icon=e-module-conf_winlist -Comment=Configure your window list properties. -Comment[ru]=Позволяет конфигурацию списка окон. -Comment[cs]=Změna vlastností seznamu oken. -Comment[de]= -Comment[eo]=Agordi la ecojn de la fenestrolisto. -Comment[es]=Configura las propiedades de su lista de ventanas. -Comment[fr]=Configure les propriétés de la liste des fenêtres. -Comment[hu]=Az ablak lista beállításait teszi lehetõvé ez a modul. -Comment[it]=Configura le proprietà della lista delle finestre. -Comment[ja]= -Comment[pt]=Permite-lhe configurar as propriedades da lista de janelas -Comment[pt_BR]= -Comment[tr]=Pencere listesi özelliklerini yapılandırır. -Comment[zh_CN]= -Comment[zh_TW]= -X-Enlightenment-ModuleType=settings diff --git a/src/modules/winlist/Makefile.am b/src/modules/winlist/Makefile.am index 58da0eb56..b5c9c1879 100644 --- a/src/modules/winlist/Makefile.am +++ b/src/modules/winlist/Makefile.am @@ -21,7 +21,9 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_winlist.c \ - e_winlist.h + e_winlist.h \ + e_int_config_winlist.c \ + e_int_config_winlist.h module_la_LIBADD = @e_libs@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version diff --git a/src/modules/conf_winlist/e_int_config_winlist.c b/src/modules/winlist/e_int_config_winlist.c similarity index 99% rename from src/modules/conf_winlist/e_int_config_winlist.c rename to src/modules/winlist/e_int_config_winlist.c index 407f06234..df442b109 100644 --- a/src/modules/conf_winlist/e_int_config_winlist.c +++ b/src/modules/winlist/e_int_config_winlist.c @@ -46,7 +46,7 @@ e_int_config_winlist(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "advanced/window_list")) return NULL; + if (e_config_dialog_find("E", "windows/window_list")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); v->create_cfdata = _create_data; @@ -56,7 +56,7 @@ e_int_config_winlist(E_Container *con, const char *params __UNUSED__) v->basic.check_changed = _basic_check_changed; cfd = e_config_dialog_new(con, _("Window List Settings"), - "E", "advanced/window_list", + "E", "windows/window_list", "preferences-winlist", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_winlist/e_int_config_winlist.h b/src/modules/winlist/e_int_config_winlist.h similarity index 100% rename from src/modules/conf_winlist/e_int_config_winlist.h rename to src/modules/winlist/e_int_config_winlist.h diff --git a/src/modules/winlist/e_mod_main.c b/src/modules/winlist/e_mod_main.c index daaa0c272..38312373b 100644 --- a/src/modules/winlist/e_mod_main.c +++ b/src/modules/winlist/e_mod_main.c @@ -22,6 +22,8 @@ EAPI void * e_modapi_init(E_Module *m) { conf_module = m; + e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "preferences-system-windows"); + e_configure_registry_item_add("windows/window_list", 70, _("Window List"), NULL, "preferences-winlist", e_int_config_winlist); e_winlist_init(); /* add module supplied action */ act = e_action_add("winlist"); @@ -62,6 +64,8 @@ e_modapi_init(E_Module *m) EAPI int e_modapi_shutdown(E_Module *m __UNUSED__) { + E_Config_Dialog *cfd; + /* remove module-supplied action */ if (act) { @@ -79,6 +83,10 @@ e_modapi_shutdown(E_Module *m __UNUSED__) act = NULL; } e_winlist_shutdown(); + + while ((cfd = e_config_dialog_get("E", "windows/window_list"))) e_object_del(E_OBJECT(cfd)); + e_configure_registry_item_del("windows/window_list"); + e_configure_registry_category_del("windows"); conf_module = NULL; return 1; } diff --git a/src/modules/winlist/e_mod_main.h b/src/modules/winlist/e_mod_main.h index a4c2a7dbf..aab247206 100644 --- a/src/modules/winlist/e_mod_main.h +++ b/src/modules/winlist/e_mod_main.h @@ -3,10 +3,11 @@ #define E_TYPEDEFS 1 #include "e_winlist.h" +#include "e_int_config_winlist.h" #undef E_TYPEDEFS #include "e_winlist.h" - +#include "e_int_config_winlist.h" EAPI extern E_Module_Api e_modapi;