enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

more conf module merges 

SVN revision: 59054
This commit is contained in:
Carsten Haitzler 2011-04-30 13:47:06 +00:00
parent c2b3532fd7
commit 82ffbc59f3
21 changed files with 16 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/illume/e.src
View File

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

8
config/minimalist/e.src
View File

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

8
config/netbook/e.src
View File

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

8
config/scaleable/e.src
View File

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

8
config/standard/e.src
View File

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

3
configure.ac
View File

@ -687,7 +687,6 @@ AC_E_OPTIONAL_MODULE([conf_mouse_cursor], true)
AC_E_OPTIONAL_MODULE([conf_transitions], true)
AC_E_OPTIONAL_MODULE([conf_startup], true)
AC_E_OPTIONAL_MODULE([conf_intl], true)
AC_E_OPTIONAL_MODULE([conf_imc], true)
AC_E_OPTIONAL_MODULE([conf_profiles], true)
AC_E_OPTIONAL_MODULE([msgbus], true)
AC_E_OPTIONAL_MODULE([conf_engine], true)
@ -803,8 +802,6 @@ src/modules/conf_startup/Makefile
src/modules/conf_startup/module.desktop
src/modules/conf_intl/Makefile
src/modules/conf_intl/module.desktop
src/modules/conf_imc/Makefile
src/modules/conf_imc/module.desktop
src/modules/conf_profiles/Makefile
src/modules/conf_profiles/module.desktop
src/modules/msgbus/Makefile

5
po/POTFILES.in
View File

@ -155,12 +155,11 @@ 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
src/modules/conf_icon_theme/e_mod_main.c
src/modules/conf_imc/e_int_config_imc.c
src/modules/conf_imc/e_int_config_imc_import.c
src/modules/conf_imc/e_mod_main.c
src/modules/conf_interaction/e_int_config_interaction.c
src/modules/conf_interaction/e_int_config_mouse.c
src/modules/conf_interaction/e_mod_main.c
src/modules/conf_intl/e_int_config_imc.c
src/modules/conf_intl/e_int_config_imc_import.c
src/modules/conf_intl/e_int_config_intl.c
src/modules/conf_intl/e_mod_main.c
src/modules/conf_keybindings/e_int_config_keybindings.c

4
src/modules/Makefile.am
View File

@ -102,10 +102,6 @@ if USE_MODULE_CONF_INTL
SUBDIRS += conf_intl
endif
if USE_MODULE_CONF_IMC
SUBDIRS += conf_imc
endif
if USE_MODULE_CONF_PROFILES
SUBDIRS += conf_profiles
endif

7
src/modules/conf_imc/.cvsignore
View File

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

33
src/modules/conf_imc/Makefile.am
View File

@ -1,33 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
MODULE = conf_imc
# 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_imc_import.c \
e_int_config_imc_import.h \
e_int_config_imc.c \
e_int_config_imc.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_imc/e-module-conf_imc.edj
View File

Binary file not shown.

44
src/modules/conf_imc/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 - Input Methods"
};
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("language", 70, _("Language"), NULL,
"preferences-desktop-locale");
e_configure_registry_item_add("language/input_method_settings", 20,
_("Input Method Settings"), NULL,
"preferences-imc", e_int_config_imc);
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", "language/input_method_settings")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("language/input_method_settings");
e_configure_registry_category_del("language");
conf_module = NULL;
return 1;
}
EAPI int
e_modapi_save(E_Module *m __UNUSED__)
{
return 1;
}

15
src/modules/conf_imc/e_mod_main.h
View File

@ -1,15 +0,0 @@
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
#define E_TYPEDEFS 1
#include "e_int_config_imc.h"
#undef E_TYPEDEFS
#include "e_int_config_imc.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_imc/module.desktop.in
View File

@ -1,34 +0,0 @@
[Desktop Entry]
Type=Link
Name=Input Methods
Name[ru]=Методы ввода
Name[cs]=Vstupní metody
Name[de]=
Name[eo]=Tajpo-metodoj
Name[es]=Método de entrada
Name[fr]=Méthode de saisie
Name[hu]=Beviteli mód
Name[it]=Metodo di input
Name[ja]=
Name[pt]=Métodos de introdução
Name[pt_BR]=
Name[tr]=Girdi Metodları
Name[zh_CN]=
Name[zh_TW]=
Icon=e-module-conf_imc
Comment=Used to select an input method.
Comment[ru]=Используется для выбора метода ввода.
Comment[cs]=Pro výběr vstupní metody.
Comment[de]=
Comment[eo]=Elekti tajpo-metodon.
Comment[es]=Usado para elegir el método de entrada.
Comment[fr]=Permet de choisir une méthode de saisie.
Comment[hu]=Beviteli mód beállítások (input method).
Comment[it]=Usato per selezionare un metodo di input.
Comment[ja]=
Comment[pt]=Permite-lhe selecionar o método de introdução
Comment[pt_BR]=
Comment[tr]=Girdi metodu seçmekte kullanılır.
Comment[zh_CN]=
Comment[zh_TW]=
X-Enlightenment-ModuleType=settings

6
src/modules/conf_intl/Makefile.am
View File

@ -22,7 +22,11 @@ pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \
e_mod_main.h \
e_int_config_intl.c \
e_int_config_intl.h
e_int_config_intl.h \
e_int_config_imc_import.c \
e_int_config_imc_import.h \
e_int_config_imc.c \
e_int_config_imc.h
module_la_LIBADD = @e_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version

0
src/modules/conf_imc/e_int_config_imc.c → src/modules/conf_intl/e_int_config_imc.c
View File

0
src/modules/conf_imc/e_int_config_imc.h → src/modules/conf_intl/e_int_config_imc.h
View File

0
src/modules/conf_imc/e_int_config_imc_import.c → src/modules/conf_intl/e_int_config_imc_import.c
View File

0
src/modules/conf_imc/e_int_config_imc_import.h → src/modules/conf_intl/e_int_config_imc_import.h
View File

6
src/modules/conf_intl/e_mod_main.c
View File

@ -20,6 +20,9 @@ e_modapi_init(E_Module *m)
_("Language Settings"), NULL,
"preferences-desktop-locale",
e_int_config_intl);
e_configure_registry_item_add("language/input_method_settings", 20,
_("Input Method Settings"), NULL,
"preferences-imc", e_int_config_imc);
conf_module = m;
e_module_delayed_set(m, 1);
return m;
@ -30,8 +33,11 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "language/input_method_settings")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "language/language_settings")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("language/input_method_settings");
e_configure_registry_item_del("language/language_settings");
e_configure_registry_category_del("language");
conf_module = NULL;

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

@ -3,8 +3,11 @@
#define E_TYPEDEFS 1
#include "e_int_config_intl.h"
#include "e_int_config_imc.h"
#undef E_TYPEDEFS
#include "e_int_config_intl.h"
#include "e_int_config_imc.h"
EAPI extern E_Module_Api e_modapi;