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

more module merging. 

SVN revision: 59058
This commit is contained in:
Carsten Haitzler 2011-05-01 03:09:10 +00:00
parent 86805db0a9
commit 1a3f544f54
20 changed files with 9 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

8
config/illume/e.src
View File

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

8
config/minimalist/e.src
View File

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

8
config/netbook/e.src
View File

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

8
config/scaleable/e.src
View File

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

8
config/standard/e.src
View File

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

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_profiles], true)
AC_E_OPTIONAL_MODULE([msgbus], true)
AC_E_OPTIONAL_MODULE([conf_applications], true)
AC_E_OPTIONAL_MODULE([conf_display], true)
@ -800,8 +799,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_profiles/Makefile
src/modules/conf_profiles/module.desktop
src/modules/msgbus/Makefile
src/modules/msgbus/module.desktop
src/modules/conf_applications/Makefile

3
po/POTFILES.in
View File

@ -137,6 +137,7 @@ src/modules/conf_borders/e_int_config_borders.c
src/modules/conf_borders/e_mod_main.c
src/modules/conf_colors/e_int_config_color_classes.c
src/modules/conf_colors/e_mod_main.c
src/modules/conf_dialogs/e_int_config_profiles.c
src/modules/conf_dialogs/e_int_config_dialogs.c
src/modules/conf_dialogs/e_mod_main.c
src/modules/conf_display/e_int_config_display.c
@ -172,8 +173,6 @@ 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
src/modules/conf_profiles/e_mod_main.c
src/modules/conf_scale/e_int_config_scale.c
src/modules/conf_scale/e_mod_main.c
src/modules/conf_shelves/e_int_config_shelf.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_PROFILES
SUBDIRS += conf_profiles
endif
if USE_MODULE_MSGBUS
SUBDIRS += msgbus
endif

4
src/modules/conf_dialogs/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_dialogs.c \
e_int_config_dialogs.h
e_int_config_dialogs.h \
e_int_config_profiles.c \
e_int_config_profiles.h
module_la_LIBADD = @e_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version

0
src/modules/conf_profiles/e_int_config_profiles.c → src/modules/conf_dialogs/e_int_config_profiles.c
View File

0
src/modules/conf_profiles/e_int_config_profiles.h → src/modules/conf_dialogs/e_int_config_profiles.h
View File

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

@ -16,6 +16,7 @@ e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("settings", 80, _("Settings"), NULL, "preferences-system");
e_configure_registry_item_add("settings/dialogs", 10, _("Dialogs"), NULL, "preferences-system", e_int_config_dialogs);
e_configure_registry_item_add("settings/profiles", 50, _("Profiles"), NULL, "preferences-profiles", e_int_config_profiles);
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", "settings/profiles"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "settings/dialogs"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("settings/profiles");
e_configure_registry_item_del("settings/dialogs");
e_configure_registry_category_del("settings");
conf_module = NULL;

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

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

7
src/modules/conf_profiles/.cvsignore
View File

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

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

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

Binary file not shown.

44
src/modules/conf_profiles/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 - Profiles"
};
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("settings", 80, _("Settings"),
NULL, "preferences-system");
e_configure_registry_item_add("settings/profiles", 50, _("Profiles"),
NULL, "preferences-profiles",
e_int_config_profiles);
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", "settings/profiles")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("settings/profiles");
e_configure_registry_category_del("settings");
conf_module = NULL;
return 1;
}
EAPI int
e_modapi_save(E_Module *m __UNUSED__)
{
return 1;
}

16
src/modules/conf_profiles/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_profiles.h"
#undef E_TYPEDEFS
#include "e_int_config_profiles.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_profiles/module.desktop.in
View File

@ -1,34 +0,0 @@
[Desktop Entry]
Type=Link
Name=Profiles
Name[ru]=Профили
Name[cs]=Profily
Name[de]=
Name[eo]=Profiloj
Name[es]=Perfiles
Name[fr]=Profils
Name[hu]=Profilok
Name[it]=Profili
Name[ja]=
Name[pt]=Perfis
Name[pt_BR]=
Name[tr]=Profiller
Name[zh_CN]=
Name[zh_TW]=
Icon=e-module-conf_profiles
Comment=Allows management of configuration profiles.
Comment[ru]=Позволяет управлять конфигурацией профилей.
Comment[cs]=Správa profilů.
Comment[de]=
Comment[eo]=Administri agordajn profilojn.
Comment[es]=Permite la administración de perfiles de configuración.
Comment[fr]=Gestionnaire des profils.
Comment[hu]=Lehetőséged van különböző profilok beállítására.
Comment[it]=Consente la gestione dei profili di configurazione.
Comment[ja]=
Comment[pt]=Permite-lhe configurar os perfis
Comment[pt_BR]=
Comment[tr]=Profillerin yapılandırmasını yönetir.
Comment[zh_CN]=
Comment[zh_TW]=
X-Enlightenment-ModuleType=settings