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

more merging of modules 

SVN revision: 59056
This commit is contained in:
Carsten Haitzler 2011-05-01 02:51:21 +00:00
parent 82ffbc59f3
commit d2dc4fd3ae
20 changed files with 9 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/illume-home/e.src
View File

@ -1186,12 +1186,6 @@ group "E_Config" struct {
value "delayed" uchar: 1;
value "priority" int: 0;
}
group "E_Config_Module" struct {
value "name" string: "conf_engine";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
group "E_Config_Module" struct {
value "name" string: "conf_interaction";
value "enabled" uchar: 1;

8
config/illume/e.src
View File

@ -127,14 +127,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_engine";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_startup";

8
config/minimalist/e.src
View File

@ -249,14 +249,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_engine";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_interaction";

8
config/netbook/e.src
View File

@ -281,14 +281,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_engine";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "fileman";

8
config/scaleable/e.src
View File

@ -72,14 +72,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_engine";
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

@ -72,14 +72,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_engine";
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

@ -689,7 +689,6 @@ AC_E_OPTIONAL_MODULE([conf_startup], true)
AC_E_OPTIONAL_MODULE([conf_intl], true)
AC_E_OPTIONAL_MODULE([conf_profiles], true)
AC_E_OPTIONAL_MODULE([msgbus], true)
AC_E_OPTIONAL_MODULE([conf_engine], true)
AC_E_OPTIONAL_MODULE([conf_applications], true)
AC_E_OPTIONAL_MODULE([conf_display], true)
AC_E_OPTIONAL_MODULE([conf_shelves], true)
@ -806,8 +805,6 @@ src/modules/conf_profiles/Makefile
src/modules/conf_profiles/module.desktop
src/modules/msgbus/Makefile
src/modules/msgbus/module.desktop
src/modules/conf_engine/Makefile
src/modules/conf_engine/module.desktop
src/modules/conf_applications/Makefile
src/modules/conf_applications/module.desktop
src/modules/conf_display/Makefile

3
po/POTFILES.in
View File

@ -149,8 +149,6 @@ src/modules/conf_display/e_int_config_dpms.c
src/modules/conf_display/e_mod_main.c
src/modules/conf_edgebindings/e_int_config_edgebindings.c
src/modules/conf_edgebindings/e_mod_main.c
src/modules/conf_engine/e_int_config_engine.c
src/modules/conf_engine/e_mod_main.c
src/modules/conf_fonts/e_int_config_fonts.c
src/modules/conf_fonts/e_mod_main.c
src/modules/conf_icon_theme/e_int_config_icon_themes.c
@ -174,6 +172,7 @@ src/modules/conf_mouse_cursor/e_int_config_cursor.c
src/modules/conf_mouse_cursor/e_mod_main.c
src/modules/conf_paths/e_int_config_paths.c
src/modules/conf_paths/e_mod_main.c
src/modules/conf_performance/e_int_config_engine.c
src/modules/conf_performance/e_int_config_performance.c
src/modules/conf_performance/e_mod_main.c
src/modules/conf_profiles/e_int_config_profiles.c

4
src/modules/Makefile.am
View File

@ -110,10 +110,6 @@ if USE_MODULE_MSGBUS
SUBDIRS += msgbus
endif
if USE_MODULE_CONF_ENGINE
SUBDIRS += conf_engine
endif
if USE_MODULE_CONF_APPLICATIONS
SUBDIRS += conf_applications
endif

7
src/modules/conf_engine/.cvsignore
View File

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

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

@ -1,31 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
MODULE = conf_engine
# 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_engine.c \
e_int_config_engine.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_engine/e-module-conf_engine.edj
View File

Binary file not shown.

43
src/modules/conf_engine/e_mod_main.c
View File

@ -1,43 +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 - Engine"
};
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL,
"preferences-advanced");
e_configure_registry_item_add("advanced/engine", 50, _("Engine"), NULL,
"preferences-engine", e_int_config_engine);
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/engine")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("advanced/engine");
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_engine/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_engine.h"
#undef E_TYPEDEFS
#include "e_int_config_engine.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_engine/module.desktop.in
View File

@ -1,34 +0,0 @@
[Desktop Entry]
Type=Link
Name=Engine
Name[ru]=Движок
Name[cs]=Engine
Name[de]=
Name[eo]=Motoro
Name[es]=Motor
Name[fr]=Moteur
Name[hu]=Meghajtó
Name[it]=Motore
Name[ja]=
Name[pt]=Motor
Name[pt_BR]=
Name[tr]=Motor
Name[zh_CN]=
Name[zh_TW]=
Icon=e-module-conf_engine
Comment=Used to select the rendering engine.
Comment[ru]=Используется для выбора движка для системы прорисовки.
Comment[cs]=Použit pro volbu vykreslovacího enginu.
Comment[de]=
Comment[eo]=Elekti la bildigan motoron.
Comment[es]=Usado para seleccionar el motor de renderizado.
Comment[fr]=Permet de choisir le moteur de rendu.
Comment[hu]=A megjelenítő motor (rendering engine) kiválasztása.
Comment[it]=Usato per selezionere il motore di rendering.
Comment[ja]=
Comment[pt]=Permite-lhe selecionar o motor de renderização
Comment[pt_BR]=
Comment[tr]=Render motorunu seçmekte kullanılır.
Comment[zh_CN]=
Comment[zh_TW]=
X-Enlightenment-ModuleType=settings

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

@ -21,7 +21,9 @@ pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \
e_mod_main.h \
e_int_config_performance.c \
e_int_config_performance.h
e_int_config_performance.h \
e_int_config_engine.c \
e_int_config_engine.h
module_la_LIBADD = @e_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version

0
src/modules/conf_engine/e_int_config_engine.c → src/modules/conf_performance/e_int_config_engine.c
View File

0
src/modules/conf_engine/e_int_config_engine.h → src/modules/conf_performance/e_int_config_engine.h
View File

3
src/modules/conf_performance/e_mod_main.c
View File

@ -16,6 +16,7 @@ e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced");
e_configure_registry_item_add("advanced/performance", 20, _("Performance"), NULL, "preferences-system-performance", e_int_config_performance);
e_configure_registry_item_add("advanced/engine", 50, _("Engine"), NULL, "preferences-engine", e_int_config_engine);
conf_module = m;
e_module_delayed_set(m, 1);
return m;
@ -25,7 +26,9 @@ EAPI int
e_modapi_shutdown(E_Module *m __UNUSED__)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "advanced/engine"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "advanced/performance"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("advanced/engine");
e_configure_registry_item_del("advanced/performance");
e_configure_registry_category_del("advanced");
conf_module = NULL;

2
src/modules/conf_performance/e_mod_main.h
View File

@ -3,9 +3,11 @@
#define E_TYPEDEFS 1
#include "e_int_config_performance.h"
#include "e_int_config_engine.h"
#undef E_TYPEDEFS
#include "e_int_config_performance.h"
#include "e_int_config_engine.h"
EAPI extern E_Module_Api e_modapi;