vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more merging of modules that are needlessly split 

SVN revision: 59053
This commit is contained in:
Carsten Haitzler 2011-04-30 13:35:25 +00:00
parent ed7aba1cfd
commit c2b3532fd7
18 changed files with 16 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/minimalist/e.src
View File

@ -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";

8
config/netbook/e.src
View File

@ -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";

8
config/scaleable/e.src
View File

@ -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";

8
config/standard/e.src
View File

@ -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";

3
configure.ac
View File

@ -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

3
po/POTFILES.in
View File

@ -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

4
src/modules/Makefile.am
View File

@ -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

7
src/modules/conf_winlist/.cvsignore
View File

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

31
src/modules/conf_winlist/Makefile.am
View File

@ -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)

BIN
src/modules/conf_winlist/e-module-conf_winlist.edj
View File

Binary file not shown.

44
src/modules/conf_winlist/e_mod_main.c
View File

@ -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;
}

16
src/modules/conf_winlist/e_mod_main.h
View File

@ -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

34
src/modules/conf_winlist/module.desktop.in
View File

@ -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

4
src/modules/winlist/Makefile.am
View File

@ -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

4
src/modules/conf_winlist/e_int_config_winlist.c → src/modules/winlist/e_int_config_winlist.c
View File

@ -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;
}

0
src/modules/conf_winlist/e_int_config_winlist.h → src/modules/winlist/e_int_config_winlist.h
View File

8
src/modules/winlist/e_mod_main.c
View File

@ -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;
}

3
src/modules/winlist/e_mod_main.h
View File

@ -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;