part of re-arranging modules. i've mered all the screen modules as

they form more of a logical group, so nothing lost here, just now its
ALL inside conf_display (like conf_applications actually).

ths does NOT mean we merge every category entirely.

for example (this is kind of a plan):

in input i'd merge key bindings, mouse bindings AND i'd bring over
acpi bindings. edge bindings i'd keep alone for now. interaction and
mouse settings i'd merge.

in windows i'd merge everything except window list and window
remembers. window list i'd merge into the winlist module itself as its
the configuration FOR that module (and then config for it i'd move to
its own config file). window rememebrs i'd keep on its own because its
a complex thing that might want to be totally hidden or re-vamped on
its own.

in menus i'd merge client list menu over to the merged "windows"
module (change its name to Window List Menu too).

in language i'd merge both language and input method setting. both
are related to dealing with multiple languages (input and display).

in look i'd leave wallpaper2, and merge wallpaper, theme, colors, fonts,
startup, icon theme, transitions and scaling. i'd merge merge mouse
cursor look over to the mouse settings + interaction module up in
input (but keep it in the look category). borders i'd merge over to
the "big windows merged module" but keep it in the look category.

in advanced i'd merge performance and engine. leave the rest.

in settings i'd leave it as-is.

in extensions i'd move shelves over to the screen category, but keep
it as a module of its own. pager i'd move to the screen category.
leave mixer and connman where they are. everything i'd keep here
- but i'd be tempted to say all the evry modules should be merged into
a single everything modules. they can keep their entries though.
gadgets i'd move over to the screen category

in files i'd merge file icons and file manager modules. keep 2 conf
entries tho (ie conf_mime joins fileman module). yes - i know e has
file selectors and they use the mime conf too, but to most people they
will just accept the file selector as-is and if they want to configure
icons per file tyope.. well.. load fileman module (can turn off
desktop icons if u want).

-------

why do this? fewer modules to load for e. as such e does spend a
fair bit of its startup time thrashing the disk around loading tonnes
of miniature modules. merging them means less thrashing. there is an
argument to be made that these should even become external processes,
but then we'd need to allow them to remote configure e and thats a
complex beastie in and of itself. we could also load and unload some
modules on the fly. this requires extra features in e17's module
setup, but can be done. worry about this for e18/19 etc. for e17 just
reduce the module count to a saner number (outside of the conf modules
which were the worst here, everything and illume are the next worst.
as above - evry could merge i think. illume vs illume2 cant merge, but
i'd consider merging the toggle modules, blutetooth, indicator and home
modules and then the  keyboard and softkey modules (as they occupy the same
screen space basically). so that'd take it to illume, illume2,
illume-home, illume-key

how's that for a plan? who wants to help. this is easy stuff really.
just re-shuffling files and makefile.am content and some module
desktop.in files, and inserting some hooks. in module main setup funcs
and.. fixing e config profiles to not load the removed mods.



SVN revision: 58282
This commit is contained in:
Carsten Haitzler 2011-04-03 03:51:40 +00:00
parent a8744bd1c5
commit 10b6fe25eb
53 changed files with 95 additions and 893 deletions

View File

@ -55,14 +55,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_desk";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_dialogs";
@ -183,14 +175,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_desks";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_scale";

View File

@ -105,30 +105,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_desk";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_desklock";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_desks";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_dialogs";
@ -145,14 +121,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_dpms";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_fonts";
@ -265,14 +233,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_screensaver";
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";

View File

@ -137,30 +137,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_desk";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_desklock";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_desks";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_dialogs";
@ -177,14 +153,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_dpms";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_fonts";
@ -297,14 +265,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_screensaver";
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";

View File

@ -152,14 +152,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_screensaver";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_profiles";
@ -272,14 +264,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_dpms";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_display";
@ -296,30 +280,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_desks";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_desklock";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_desk";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_colors";

View File

@ -152,14 +152,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_screensaver";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_profiles";
@ -272,14 +264,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_dpms";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_display";
@ -296,30 +280,6 @@ group "E_Config" struct {
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_desks";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_desklock";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_desk";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_colors";

View File

@ -642,12 +642,7 @@ 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_desks], true)
AC_E_OPTIONAL_MODULE([conf_desk], true)
AC_E_OPTIONAL_MODULE([conf_display], true)
AC_E_OPTIONAL_MODULE([conf_desklock], true)
AC_E_OPTIONAL_MODULE([conf_screensaver], true)
AC_E_OPTIONAL_MODULE([conf_dpms], true)
AC_E_OPTIONAL_MODULE([conf_shelves], true)
AC_E_OPTIONAL_MODULE([conf_keybindings], true)
AC_E_OPTIONAL_MODULE([conf_mousebindings], true)
@ -782,18 +777,8 @@ 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_desks/Makefile
src/modules/conf_desks/module.desktop
src/modules/conf_desk/Makefile
src/modules/conf_desk/module.desktop
src/modules/conf_display/Makefile
src/modules/conf_display/module.desktop
src/modules/conf_desklock/Makefile
src/modules/conf_desklock/module.desktop
src/modules/conf_screensaver/Makefile
src/modules/conf_screensaver/module.desktop
src/modules/conf_dpms/Makefile
src/modules/conf_dpms/module.desktop
src/modules/conf_shelves/Makefile
src/modules/conf_shelves/module.desktop
src/modules/conf_keybindings/Makefile

View File

@ -122,30 +122,10 @@ if USE_MODULE_CONF_APPLICATIONS
SUBDIRS += conf_applications
endif
if USE_MODULE_CONF_DESKS
SUBDIRS += conf_desks
endif
if USE_MODULE_CONF_DESK
SUBDIRS += conf_desk
endif
if USE_MODULE_CONF_DISPLAY
SUBDIRS += conf_display
endif
if USE_MODULE_CONF_DESKLOCK
SUBDIRS += conf_desklock
endif
if USE_MODULE_CONF_SCREENSAVER
SUBDIRS += conf_screensaver
endif
if USE_MODULE_CONF_DPMS
SUBDIRS += conf_dpms
endif
if USE_MODULE_CONF_SHELVES
SUBDIRS += conf_shelves
endif

View File

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

View File

@ -1,31 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
MODULE = conf_desk
# 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_desk.c \
e_int_config_desk.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)

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 - Desk"
};
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("internal", -1, _("Internal"), NULL,
"enlightenment/internal");
e_configure_registry_item_add("internal/desk", -1, _("Desk"), NULL,
"preferences-system-windows",
e_int_config_desk);
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", "internal/desk")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("internal/desk");
e_configure_registry_category_del("internal");
conf_module = NULL;
return 1;
}
EAPI int
e_modapi_save(E_Module *m __UNUSED__)
{
return 1;
}

View File

@ -1,17 +0,0 @@
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
#define E_TYPEDEFS 1
#include "e_int_config_desk.h"
#undef E_TYPEDEFS
#include "e_int_config_desk.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

View File

@ -1,34 +0,0 @@
[Desktop Entry]
Type=Link
Name=Desk
Name[ru]=Столы
Name[cs]=Plocha
Name[de]=
Name[eo]=Labortablo
Name[es]=Escritorio
Name[fr]=Bureau
Name[hu]=Munkaasztal
Name[it]=Desktop
Name[ja]=
Name[pt]=Ambiente de trabalho
Name[pt_BR]=
Name[tr]=Masaüstü
Name[zh_CN]=
Name[zh_TW]=
Icon=e-module-conf_desk
Comment=Used to configure the desktop name and wallpaper for individual virtual desktops.
Comment[ru]=Используется для настройки имени и фона для индивидуальных виртуальных рабочих столов.
Comment[cs]=Použit pro nastavení jména plochy a pozadí pro každou virtuální plochu.
Comment[de]=
Comment[eo]=Agordi la labortablan nomon kaj etoson por ĉiu virtuala labortablo.
Comment[es]=Usado para configurar el nombre del escritorio y los fondos de pantalla para cada escritorio virtual individualmente.
Comment[fr]=Permet de définir le nom et le fond d'écran de chaque bureau virtuel.
Comment[hu]=Itt a munkaasztalod beállításait végezheted el. Beállíthatod a háttérképet és kezelheted a virtuális munkaasztalokat.
Comment[it]=Usato per configurare il nome e lo sfondo per ogni singolo desktop virtuale.
Comment[ja]=
Comment[pt]=Permite-lhe configurar o nome e a imagem de cada ambiente de trabalho
Comment[pt_BR]=
Comment[tr]=Masaüstü adı ve her sanal masaüstüne ait duvarkağıtlarını yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
X-Enlightenment-ModuleType=settings

View File

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

View File

@ -1,33 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
MODULE = conf_desklock
# 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_desklock.c \
e_int_config_desklock.h \
e_int_config_desklock_fsel.c \
e_int_config_desklock_fsel.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)

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 - Screen Lock"
};
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("screen", 30, _("Screen"), NULL,
"preferences-desktop-display");
e_configure_registry_item_add("screen/screen_lock", 30, _("Screen Lock"),
NULL, "preferences-desklock",
e_int_config_desklock);
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", "screen/screen_lock")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("screen/screen_lock");
e_configure_registry_category_del("screen");
conf_module = NULL;
return 1;
}
EAPI int
e_modapi_save(E_Module *m __UNUSED__)
{
return 1;
}

View File

@ -1,18 +0,0 @@
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
#define E_TYPEDEFS 1
#include "e_int_config_desklock.h"
#include "e_int_config_desklock_fsel.h"
#undef E_TYPEDEFS
#include "e_int_config_desklock.h"
#include "e_int_config_desklock_fsel.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

View File

@ -1,34 +0,0 @@
[Desktop Entry]
Type=Link
Name=Screen Lock
Name[ru]=Блокировка экрана
Name[cs]=Uzamčení obrazovky
Name[de]=
Name[eo]=Ekranŝlosilo
Name[es]=Bloqueo de pantalla
Name[fr]=Verrouillage de l'écran
Name[hu]=Képernyő zárolása
Name[it]=Bloccaschermo
Name[ja]=
Name[pt]=Bloqueio do ecrã
Name[pt_BR]=
Name[tr]=Ekran Kilidi
Name[zh_CN]=
Name[zh_TW]=
Icon=e-module-conf_desklock
Comment=Configures the integrated desk lock.
Comment[ru]=Настройка встроенной функции блокировки экрана.
Comment[cs]=Volby pro integrovanou funkci zamčení obrazovky.
Comment[de]=
Comment[eo]=Agordi la integritan labortablan ŝlosilon.
Comment[es]=Configura el bloqueador de escritorio integrado.
Comment[fr]=Configure le verrouillage de l'écran intégré.
Comment[hu]=A beépített asztal zároló beállításai.
Comment[it]=Configura il bloccaschermo integrato.
Comment[ja]=
Comment[pt]=Permite-lhe configurar o bloqueio do ecrã
Comment[pt_BR]=
Comment[tr]=Dahili masaüstü kilidini yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
X-Enlightenment-ModuleType=settings

View File

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

View File

@ -1,31 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
MODULE = conf_desks
# 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_desks.c \
e_int_config_desks.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)

View File

@ -1,46 +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 - Virtual Desktops"
};
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("screen", 30, _("Screen"), NULL,
"preferences-desktop-display");
e_configure_registry_item_add("screen/virtual_desktops", 10,
_("Virtual Desktops"), NULL,
"preferences-desktop", e_int_config_desks);
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", "screen/virtual_desktops")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("screen/virtual_desktops");
e_configure_registry_category_del("screen");
conf_module = NULL;
return 1;
}
EAPI int
e_modapi_save(E_Module *m __UNUSED__)
{
return 1;
}

View File

@ -1,16 +0,0 @@
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
#define E_TYPEDEFS 1
#include "e_int_config_desks.h"
#undef E_TYPEDEFS
#include "e_int_config_desks.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

View File

@ -1,34 +0,0 @@
[Desktop Entry]
Type=Link
Name=Virtual Desktops
Name[ru]=Виртуальные столы
Name[cs]=Virtuální plochy
Name[de]=
Name[eo]=Virtualaj labortabloj
Name[es]=Escritorios virtuales
Name[fr]=Bureaux virtuels
Name[hu]=Virtuális munkaasztalok
Name[it]=Desktop virtuali
Name[ja]=
Name[pt]=Ambientes virtuais
Name[pt_BR]=
Name[tr]=Sanal Masaüstleri
Name[zh_CN]=
Name[zh_TW]=
Icon=e-module-conf_desks
Comment=Configure the virtual desktop properties.
Comment[ru]=Конфигурация и настройки виртуальных рабочих столов.
Comment[cs]=Volby pro virtuální plochy.
Comment[de]=
Comment[eo]=Agordi la ecojn de la virtualaj labortablaj.
Comment[es]=Configura las propiedades de los escritorios virtuales.
Comment[fr]=Configure les propriétés des bureaux virtuels.
Comment[hu]=Virtuális munkaasztalok beállítása.
Comment[it]=Configura le proprietà dei desktop virtuali.
Comment[ja]=
Comment[pt]=Permite-lhe configurar as propriedades dos ambientes virtuais
Comment[pt_BR]=
Comment[tr]=Sanal masaüstü özelliklerini yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
X-Enlightenment-ModuleType=settings

View File

@ -4,7 +4,7 @@ MODULE = conf_display
# data files for the module
filesdir = $(libdir)/enlightenment/modules/$(MODULE)
files_DATA = \
e-module-$(MODULE).edj module.desktop
module.desktop
EXTRA_DIST = $(files_DATA)
@ -20,9 +20,21 @@ 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_display.c \
e_int_config_display.h
e_int_config_display.c \
e_int_config_display.h \
e_int_config_screensaver.c \
e_int_config_screensaver.h \
e_int_config_dpms.c \
e_int_config_dpms.h \
e_int_config_desklock.c \
e_int_config_desklock.h \
e_int_config_desklock_fsel.c \
e_int_config_desklock_fsel.h \
e_int_config_desks.c \
e_int_config_desks.h \
e_int_config_desk.c \
e_int_config_desk.h
module_la_LIBADD = @e_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h

View File

@ -8,7 +8,7 @@ static E_Module *conf_module = NULL;
EAPI E_Module_Api e_modapi =
{
E_MODULE_API_VERSION,
"Settings - Screen Resolution"
"Settings - Screen"
};
EAPI void *
@ -16,10 +16,35 @@ e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("screen", 30, _("Screen"), NULL,
"preferences-desktop-display");
e_configure_registry_item_add("screen/virtual_desktops", 10,
_("Virtual Desktops"), NULL,
"preferences-desktop", e_int_config_desks);
e_configure_registry_item_add("screen/screen_resolution", 20,
_("Screen Resolution"), NULL,
"preferences-system-screen-resolution",
e_int_config_display);
e_configure_registry_item_add("screen/screen_lock", 30,
_("Screen Lock"), NULL,
"preferences-desklock",
e_int_config_desklock);
e_configure_registry_item_add("screen/screen_saver", 40,
_("Screen Saver"), NULL,
"preferences-desktop-screensaver",
e_int_config_screensaver);
e_configure_registry_item_add("screen/power_management", 50,
_("Power Management"), NULL,
"preferences-system-power-management",
e_int_config_dpms);
e_configure_registry_category_add("internal", -1, _("Internal"), NULL,
"enlightenment/internal");
e_configure_registry_item_add("internal/desk", -1,
_("Desk"), NULL,
"preferences-system-windows",
e_int_config_desk);
conf_module = m;
e_module_delayed_set(m, 1);
return m;
@ -30,9 +55,30 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "internal/desk")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("internal/desk");
e_configure_registry_category_del("internal");
while ((cfd = e_config_dialog_get("E", "screen/power_management")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "screen/screen_saver")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "screen/screen_lock")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "screen/screen_resolution")))
e_object_del(E_OBJECT(cfd));
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "screen/virtual_desktops")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("screen/power_management");
e_configure_registry_item_del("screen/screen_saver");
e_configure_registry_item_del("screen/screen_lock");
e_configure_registry_item_del("screen/screen_resolution");
e_configure_registry_item_del("screen/virtual_desktops");
e_configure_registry_category_del("screen");
conf_module = NULL;
return 1;

View File

@ -3,9 +3,21 @@
#define E_TYPEDEFS 1
#include "e_int_config_display.h"
#include "e_int_config_screensaver.h"
#include "e_int_config_dpms.h"
#include "e_int_config_desklock.h"
#include "e_int_config_desklock_fsel.h"
#include "e_int_config_desks.h"
#include "e_int_config_desk.h"
#undef E_TYPEDEFS
#include "e_int_config_display.h"
#include "e_int_config_screensaver.h"
#include "e_int_config_dpms.h"
#include "e_int_config_desklock.h"
#include "e_int_config_desklock_fsel.h"
#include "e_int_config_desks.h"
#include "e_int_config_desk.h"
EAPI extern E_Module_Api e_modapi;

View File

@ -1,34 +1,34 @@
[Desktop Entry]
Type=Link
Name=Screen Resolution
Name=Screen
Name[ru]=Резолюция экрана
Name[cs]=Rozlišení obrazovky
Name[cs]=
Name[de]=
Name[eo]=Ekrandistingivo
Name[es]=Resolución de pantalla
Name[fr]=Résolution de l'écran
Name[hu]=Képernyő felbontása
Name[it]=Risoluzione schermo
Name[eo]=
Name[es]=
Name[fr]=
Name[hu]=
Name[it]=
Name[ja]=
Name[pt]=Resolução do ecrã
Name[pt]=
Name[pt_BR]=
Name[tr]=Ekran Çözünürlüğü
Name[tr]=
Name[zh_CN]=
Name[zh_TW]=
Icon=e-module-conf_display
Comment=Used to configure your screen's resolution.
Icon=preferences-desktop-screensaver
Comment=Used to configure your screen.
Comment[ru]=Используется для настройки резолюции Вашего экрана.
Comment[cs]=Použit k nastavení rozlišení obrazovky.
Comment[cs]=
Comment[de]=
Comment[eo]=Agordi sian ekrandistingivon.
Comment[es]=Usado para configurar su resolución de pantalla.
Comment[fr]=Permet de configurer la résolution de l'écran.
Comment[hu]=Segítségével beállíthatod a képernyőd felbontását.
Comment[it]=Usato per configurare la risoluzione del vostro schermo.
Comment[eo]=
Comment[es]=
Comment[fr]=
Comment[hu]=
Comment[it]=
Comment[ja]=
Comment[pt]=Permite-lhe configurar a resolução do ecrã
Comment[pt]=
Comment[pt_BR]=
Comment[tr]=Ekranınızın çözünürlüğünü yapılandırır.
Comment[tr]=
Comment[zh_CN]=
Comment[zh_TW]=
X-Enlightenment-ModuleType=settings

View File

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

View File

@ -1,31 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
MODULE = conf_dpms
# 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_dpms.c \
e_int_config_dpms.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)

View File

@ -1,39 +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 - Power Management"
};
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "preferences-desktop-display");
e_configure_registry_item_add("screen/power_management", 50, _("Power Management"), NULL, "preferences-system-power-management", e_int_config_dpms);
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", "screen/power_management"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("screen/power_management");
e_configure_registry_category_del("screen");
conf_module = NULL;
return 1;
}
EAPI int
e_modapi_save(E_Module *m __UNUSED__)
{
return 1;
}

View File

@ -1,16 +0,0 @@
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
#define E_TYPEDEFS 1
#include "e_int_config_dpms.h"
#undef E_TYPEDEFS
#include "e_int_config_dpms.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

View File

@ -1,34 +0,0 @@
[Desktop Entry]
Type=Link
Name=Power Management
Name[ru]=Управление питанием
Name[cs]=Správa napájení
Name[de]=
Name[eo]=Potenca Administrado
Name[es]=Administración de energía
Name[fr]=Gestion de l'énergie
Name[hu]=Energiakezelés
Name[it]=Gestione energetica
Name[ja]=
Name[pt]=Gestão de energia
Name[pt_BR]=
Name[tr]=Güç Yönetimi
Name[zh_CN]=
Name[zh_TW]=
Icon=e-module-conf_dpms
Comment=Configure the DPMS settings of your system.
Comment[ru]=Конфигурация и настройка DPMS (управление питанием экрана) для Вашей системы.
Comment[cs]=Volby DPMS v systému.
Comment[de]=
Comment[eo]=Agordi la parametrojn de DPMS (Signalado de potenca administrado de ekrano) de sia sistemo.
Comment[es]=Configura las opciones de DPMS de su sistema.
Comment[fr]=Paramétrage du DPMS.
Comment[hu]=DPMS beállítások elvégzése.
Comment[it]=Configura le impostazioni DPMS del vostro sistema.
Comment[ja]=
Comment[pt]=Permite-lhe configurar as definições de energia do seu sistema
Comment[pt_BR]=
Comment[tr]=Sisteminizin DPMS ayarlarını yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
X-Enlightenment-ModuleType=settings

View File

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

View File

@ -1,31 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
MODULE = conf_screensaver
# data files for the module
filesdir = $(libdir)/enlightenment/modules/$(MODULE)
files_DATA = \
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_screensaver.c \
e_int_config_screensaver.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)

View File

@ -1,39 +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 - Screen Saver"
};
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "preferences-desktop-display");
e_configure_registry_item_add("screen/screen_saver", 40, _("Screen Saver"), NULL, "preferences-desktop-screensaver", e_int_config_screensaver);
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", "screen/screen_saver"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("screen/screen_saver");
e_configure_registry_category_del("screen");
conf_module = NULL;
return 1;
}
EAPI int
e_modapi_save(E_Module *m __UNUSED__)
{
return 1;
}

View File

@ -1,16 +0,0 @@
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
#define E_TYPEDEFS 1
#include "e_int_config_screensaver.h"
#undef E_TYPEDEFS
#include "e_int_config_screensaver.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

View File

@ -1,34 +0,0 @@
[Desktop Entry]
Type=Link
Name=Screen Saver
Name[ru]=Хранитель экрана
Name[cs]=Spořič obrazovky
Name[de]=
Name[eo]=Ekrankurtenoj
Name[es]=Salvapantallas
Name[fr]=Écran de veille
Name[hu]=Képernyővédő
Name[it]=Screensaver
Name[ja]=
Name[pt]=Proteção de ecrã
Name[pt_BR]=
Name[tr]=Ekran Koruyucu
Name[zh_CN]=
Name[zh_TW]=
Icon=preferences-desktop-screensaver
Comment=Configures the X screensaver.
Comment[ru]=Настройка хранителя экрана X.
Comment[cs]=Umožňuje nastavení X spořiče.
Comment[de]=
Comment[eo]=Agordi la ekrankurtenon de X.
Comment[es]=Configura el salvapantallas de X.
Comment[fr]=Paramétrage de l'écran de veille de X.
Comment[hu]=Az X képernyővédő beállítása.
Comment[it]=Configura lo screensaver di X.
Comment[ja]=
Comment[pt]=Permite-lhe configurar a proteção do ecrã
Comment[pt_BR]=
Comment[tr]=X ekran koruyucuyu yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
X-Enlightenment-ModuleType=settings