From 10b6fe25eb1b9c2b8ec48a3e6b4f67b78b388fe7 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 3 Apr 2011 03:51:40 +0000 Subject: [PATCH] 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 --- config/illume/e.src | 16 ------ config/minimalist/e.src | 40 -------------- config/netbook/e.src | 40 -------------- config/scaleable/e.src | 40 -------------- config/standard/e.src | 40 -------------- configure.ac | 15 ------ src/modules/Makefile.am | 20 ------- src/modules/conf_desk/.cvsignore | 7 --- src/modules/conf_desk/Makefile.am | 31 ----------- src/modules/conf_desk/e-module-conf_desk.edj | Bin 12522 -> 0 bytes src/modules/conf_desk/e_mod_main.c | 44 --------------- src/modules/conf_desk/e_mod_main.h | 17 ------ src/modules/conf_desk/module.desktop.in | 34 ------------ src/modules/conf_desklock/.cvsignore | 7 --- src/modules/conf_desklock/Makefile.am | 33 ------------ .../conf_desklock/e-module-conf_desklock.edj | Bin 18155 -> 0 bytes src/modules/conf_desklock/e_mod_main.c | 44 --------------- src/modules/conf_desklock/e_mod_main.h | 18 ------- src/modules/conf_desklock/module.desktop.in | 34 ------------ src/modules/conf_desks/.cvsignore | 7 --- src/modules/conf_desks/Makefile.am | 31 ----------- .../conf_desks/e-module-conf_desks.edj | Bin 14544 -> 0 bytes src/modules/conf_desks/e_mod_main.c | 46 ---------------- src/modules/conf_desks/e_mod_main.h | 16 ------ src/modules/conf_desks/module.desktop.in | 34 ------------ src/modules/conf_display/Makefile.am | 20 +++++-- .../conf_display/e-module-conf_display.edj | Bin 16578 -> 0 bytes .../e_int_config_desk.c | 0 .../e_int_config_desk.h | 0 .../e_int_config_desklock.c | 0 .../e_int_config_desklock.h | 0 .../e_int_config_desklock_fsel.c | 0 .../e_int_config_desklock_fsel.h | 0 .../e_int_config_desks.c | 0 .../e_int_config_desks.h | 0 .../e_int_config_dpms.c | 0 .../e_int_config_dpms.h | 0 .../e_int_config_screensaver.c | 0 .../e_int_config_screensaver.h | 0 src/modules/conf_display/e_mod_main.c | 50 +++++++++++++++++- src/modules/conf_display/e_mod_main.h | 12 +++++ src/modules/conf_display/module.desktop.in | 38 ++++++------- src/modules/conf_dpms/.cvsignore | 7 --- src/modules/conf_dpms/Makefile.am | 31 ----------- src/modules/conf_dpms/e-module-conf_dpms.edj | Bin 16958 -> 0 bytes src/modules/conf_dpms/e_mod_main.c | 39 -------------- src/modules/conf_dpms/e_mod_main.h | 16 ------ src/modules/conf_dpms/module.desktop.in | 34 ------------ src/modules/conf_screensaver/.cvsignore | 7 --- src/modules/conf_screensaver/Makefile.am | 31 ----------- src/modules/conf_screensaver/e_mod_main.c | 39 -------------- src/modules/conf_screensaver/e_mod_main.h | 16 ------ .../conf_screensaver/module.desktop.in | 34 ------------ 53 files changed, 95 insertions(+), 893 deletions(-) delete mode 100644 src/modules/conf_desk/.cvsignore delete mode 100644 src/modules/conf_desk/Makefile.am delete mode 100644 src/modules/conf_desk/e-module-conf_desk.edj delete mode 100644 src/modules/conf_desk/e_mod_main.c delete mode 100644 src/modules/conf_desk/e_mod_main.h delete mode 100644 src/modules/conf_desk/module.desktop.in delete mode 100644 src/modules/conf_desklock/.cvsignore delete mode 100644 src/modules/conf_desklock/Makefile.am delete mode 100644 src/modules/conf_desklock/e-module-conf_desklock.edj delete mode 100644 src/modules/conf_desklock/e_mod_main.c delete mode 100644 src/modules/conf_desklock/e_mod_main.h delete mode 100644 src/modules/conf_desklock/module.desktop.in delete mode 100644 src/modules/conf_desks/.cvsignore delete mode 100644 src/modules/conf_desks/Makefile.am delete mode 100644 src/modules/conf_desks/e-module-conf_desks.edj delete mode 100644 src/modules/conf_desks/e_mod_main.c delete mode 100644 src/modules/conf_desks/e_mod_main.h delete mode 100644 src/modules/conf_desks/module.desktop.in delete mode 100644 src/modules/conf_display/e-module-conf_display.edj rename src/modules/{conf_desk => conf_display}/e_int_config_desk.c (100%) rename src/modules/{conf_desk => conf_display}/e_int_config_desk.h (100%) rename src/modules/{conf_desklock => conf_display}/e_int_config_desklock.c (100%) rename src/modules/{conf_desklock => conf_display}/e_int_config_desklock.h (100%) rename src/modules/{conf_desklock => conf_display}/e_int_config_desklock_fsel.c (100%) rename src/modules/{conf_desklock => conf_display}/e_int_config_desklock_fsel.h (100%) rename src/modules/{conf_desks => conf_display}/e_int_config_desks.c (100%) rename src/modules/{conf_desks => conf_display}/e_int_config_desks.h (100%) rename src/modules/{conf_dpms => conf_display}/e_int_config_dpms.c (100%) rename src/modules/{conf_dpms => conf_display}/e_int_config_dpms.h (100%) rename src/modules/{conf_screensaver => conf_display}/e_int_config_screensaver.c (100%) rename src/modules/{conf_screensaver => conf_display}/e_int_config_screensaver.h (100%) delete mode 100644 src/modules/conf_dpms/.cvsignore delete mode 100644 src/modules/conf_dpms/Makefile.am delete mode 100644 src/modules/conf_dpms/e-module-conf_dpms.edj delete mode 100644 src/modules/conf_dpms/e_mod_main.c delete mode 100644 src/modules/conf_dpms/e_mod_main.h delete mode 100644 src/modules/conf_dpms/module.desktop.in delete mode 100644 src/modules/conf_screensaver/.cvsignore delete mode 100644 src/modules/conf_screensaver/Makefile.am delete mode 100644 src/modules/conf_screensaver/e_mod_main.c delete mode 100644 src/modules/conf_screensaver/e_mod_main.h delete mode 100644 src/modules/conf_screensaver/module.desktop.in diff --git a/config/illume/e.src b/config/illume/e.src index 06c476d8c..a6c57571b 100644 --- a/config/illume/e.src +++ b/config/illume/e.src @@ -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"; diff --git a/config/minimalist/e.src b/config/minimalist/e.src index 0de88ef88..5c01c7430 100644 --- a/config/minimalist/e.src +++ b/config/minimalist/e.src @@ -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"; diff --git a/config/netbook/e.src b/config/netbook/e.src index 51e2e7cc2..f925cca70 100644 --- a/config/netbook/e.src +++ b/config/netbook/e.src @@ -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"; diff --git a/config/scaleable/e.src b/config/scaleable/e.src index 9441ff7c7..6e41639ed 100644 --- a/config/scaleable/e.src +++ b/config/scaleable/e.src @@ -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"; diff --git a/config/standard/e.src b/config/standard/e.src index d9f5c2978..552262768 100644 --- a/config/standard/e.src +++ b/config/standard/e.src @@ -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"; diff --git a/configure.ac b/configure.ac index 690581f7d..286f0f143 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index 093de5454..4c1b995e2 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am @@ -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 diff --git a/src/modules/conf_desk/.cvsignore b/src/modules/conf_desk/.cvsignore deleted file mode 100644 index 06d064a84..000000000 --- a/src/modules/conf_desk/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -module.la -module.desktop diff --git a/src/modules/conf_desk/Makefile.am b/src/modules/conf_desk/Makefile.am deleted file mode 100644 index 7a55e7e9d..000000000 --- a/src/modules/conf_desk/Makefile.am +++ /dev/null @@ -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) diff --git a/src/modules/conf_desk/e-module-conf_desk.edj b/src/modules/conf_desk/e-module-conf_desk.edj deleted file mode 100644 index 75aa3dc0b66368d2cd5a9ae7af26f77a3a033af3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12522 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

8LMq{9P zP@g3*n%e`GQTvZ!`@o*V%g??q;%;D7E5k_h0u}>C=Z?-kXXPO?OcSgYp4Nagm9T3_%TDl}VWg>I8O@a# zX+FTLp`*4aUr6&2W(zhLp7NA5)i9hHy%F$qW=K;5!@<5NqPyIr}fumTT0?Hw1I26Z#(VFy=X*eAaqprRld>@&Hql7pSY#ghD zhSL$T7T8R9>>X)1wAVMmmaz;P4(&76PG1C1eL%zMf_MnnI#ve_rz>LQkp511tO02_ z-4I^`L*JAyq~XxKiJfE_G#r|@HCPHf_L4Ll+EZJwOnA(XG#pwBw69+XKR~A8^hCS| z>@_@|lZHd?cf-a^Cq1@TTWA9z|%XgI?V?*ZEcPiqAYXE$c8k?P!x@DbIb>J@Pklhc8I73w ztza2x7{2T8d}Dzp&z&zZ9?7_fghIZHuR!EQr8Z0=u0*s_?82AGYPbo6d}+jOi;UY> zmez4`L6e@|5Q`Znf0SCezH~iG8_~+UEK{8k9El zA4LkQByCr!oRg=5f@8Bt@4D>dhvYGhRDm8 z>&eGbxJVdRz8i0)(3g?;;*pVbL?iu2dJh}P5MxWs#ekgzqbV%9hw?0#`XlBxR$2XiuTcK38mSw2@+a zqmAV4NuvPSjsh~vMPgUJ*hnZ3#PYyb9xRs!ULraaLM)n4Xe99ziF`d|vA0OV#auC9 z=_4xgmP_PCg(nJBUWfJq&B^PqMXJMwR7W0qxnomh-D913uCiE~k~pLyv5}Z^7~Y-r z%UREpc`TVcU=^c{SjlK3R%0U9n8;f(k!wt#@#Xvb8c77JaS|wU6VU#(g#oe)Y~65i2C6f4gQB9<*=2Em42ex3#}qi~xl zuQaiX)C&a?+|059S6YzYv(%@@4_Bo8q2~tQYt$RpuC##b+5_(w6vQG*YOV|B zhig?%{M({{wrI69!oHA*y`CuK3B5gdQYh^LGm;jT^ITTAti*LDrADj0g*>d7tl%cX z8;iXoaYM6F+f^xj9U8GkynpHCEie8cUf%wx{0ePXMfQ4>A=%|7yIU2A{I>LGo0H1q zcV;_CH)lH_yL11gE%{5JU0dxSwbc&D?qY?uc+wkL0Z3%`vI3Fb&fh;g6b_K=t4B5? z1}_uruk3Hzf%&%sBtHY~zcBdpdB=WQ$i6eaCqH)jq?fj+RAj0q8Q4B6%`YaJjKal9m{ip9U_7hIpjzjyeJ9-7NU!w?dB^b@In>5eH z(SC*+Mf%(StW?67p5Vnm)I@T$4pxeHiWM{PPr71gr|F4Jj$0N#~&35NbmN4v*`r!=y?+(qs z9+Cgg)9^nMpG|AUB$X(n+>hz>zseqkmH+oF_|IFfxYa-IB3*g^-66V6{<}lpUrYZz zL%v4suh0M68Is;c^gjjurAv3dbX2nGyFN@s_gR;2AMjg0$8gbOPoGs`6$MJwOuBwv zfuD&%;*I=*-NPgw_C7qB{nFI-&vjq>+m2iE;a-`w_Og@bYII7B?~m7AV3~b*{lZGo zSwU9Cex@Nj@|9?k?&<`Ugid!i9vF0{t54UOJ-f83oLYqL355cG-K7op9WP{bY`#&n zeR$6?=JOYAz8>PXZHyo!&1BM|@g3cN|8;`ffi&UWT?ZG>iJKmmcy3sMfzkf2w)xW> z&ZG`0@11{q%bc=NhVIcHX8T-lo1gxN=?UFaLwxSV%)dOS_uLZ;ub0dYndqbBqvO-( ztw7&P+e^>u;J245Baiu6RQHStkIH%Ku=m10Wp)iuUaXoMqCB)p??Z9YwR#sdrB{1| z1148%{jB}7%i3P+X0IESH_*PYW0r2#jxot2f?}pv{yFlmkzpevPOmw=(Pc@(m!jKA ze%vG7Q*BlKc5W4H$;oicO|vn+t^ZOqyT$b7$J^b{PA~Z_qV7Y~Q>AxbA{!?rG)D*; z4GdrH*t~c48ObkxHmj-!?KSHgH2vx_->0*yC)Ox!dA7~6+UY^DiCf0(!>cNkE1Z_M zsD2y$O!JTW(g#&7gOjZBpFm_B*5KNH{+z1VhY^FX_seluqZ=8yW|L1s1TPguegnQ1njE~=je0(3idtv&= zOY<8-4xgIsBs%}?qEYW_&W(42ok}KhgXbsiGQU^*kB+jH^5XrAy9e2qWel@eq+PCd z<+j6>tJo(dA3bGHtj zu<)qrp!NDrSDgQ>4p_PJb8f}k!PQqEs;Lzknz-fdIdbQqy;-77VeEV((dF`!s`>{< zluusqbyA>(zJ)=0;Fk|e=Q<=Uy_9BWA?kLyL;Ct21rt_%*t2zOPf6v2GxJik#`rHMd=Tpv)-_V@+MB4Q{tLGKYwp)rgSaq^ILn?q^nk6ZO|~?$GsrFURiqX*5k}jtA5|=t5ROZS-o5M z(+<1ER|f7?^5~wJdB5ReNb^PWkfy(93u6LmUqxS#yzZYAk$;ErS4mQ2KwYzHE!%M4@AEvlF{oJLe`sv^)R+|$| z%k%C!O}u(|`tI=30NJ$QoOfOj^5 z6|3$YpI;Yh*8ITV?^#x-ThU|F%tTLxw?=jDsc9)}*ciQc!m1qWOTq`IuNDlgXflil zY5Jq~bzy9$?)~?amM${+?aG?Rd&aLk{W*Q{7dK#@I(_ z=(R{bTe)1%4-5}@b=oqxanJGN$G86$e*0`t9B%lQ7VSFATZK<_)ba0z7dPleD66t*Eyo8mhOFg#Kp#f&%CcUTQ;6`kmy#ObG^}f z!m2a7Iy6SsY(L++X|DBBxBQr$3wL{8F8UCyydY(PQ}v07HZ!bDa~%R2&3c>)janW# zV0r!!zvxU(Gk0?43bR-9Uwukl{o-6o7h9{9SI;*ZprgX_Ll)zUt_;X^E_$%PN8*g= zC zQlBqAbN9$a-&>)}CF!aCYW8jrH)@nsY)U>~ zJ#UTbnN44;cJxa3={)Gj0f!}m*P5$cYoC>s>@?|ivw7y%OV!FwS4t*ycs<*=Tb$k1 zE~~qyc5&y5x?2W3OX|I>*T%75vo3@NpVJgt9Q?VlOy%o{l{K9Tg5pBPM1^%O?D{5j z>2FJJcg|o88oB*f|8(c^`5E=u3o9emIqyhmn*3FGZDTL)yT+aNLE7B-o*EW^J6goq zw~V~f{Xw1Zxb;9$+}aI=FKhew-0AF{Ft(BB`1ROrvthd{pGV(M?q8$Ay~Z5fe)3+} z$Kje4Z~Ii+6=qdvW}^t>5%twJ-_X{#@edh=g=;+;cFFDRKW{1lZwH~V4l z02^`DVe5>|O$P3fRW}QVg$^!GHi<77vy5AhUK$Gp_9h<}&(a@eKR9HHk!Fv$#nl?& zVt@B}yR~ggT9lg|(k(p$J{#B=_4Ri6aT-IwB9Ra?`mIJwC^@%iz)W0PAB#SJlE^7KGOaMzp=^KVWC z+ix3dj%vOc>Zf1RnA%WO7(KOAW7w@0&pUNjo9&)(Q|+pzKWmM}<#BeG zwVIasFD;)@pxUC#&FuFzUb&@E+49PT_r~j;JGD4(5oc7}H#F|8R(mGkSf=U+FHy5N z5Ei$7wsE{xM)fzPwKbhJwKU8FgXWZ95Z!*wa}1u@{P*}#8ozYP?R9EhO7Pw|UQ5`Q z*02%PRuR#&5BZnQjGX>^_DGct_xLjpIICE$@jhRFYS~?tX=mS9b`>mNQfIq8rQ6fG z4#7+R)>-IiGBPhWIaK4Qrr)RMTO+x)Q>`jfX|$LCJH3 zON4)^q`unmVb(uay#HLg_Ugmz*jS~hno1Q1RV+<57IwUrH#JBlwpW%@FQ%w8T*b6| z8QKQy=GqK#5D28 zGz{}-I^hvC>1Z&sa*FXX*$^ADu3XXTdaXd?>0@>4m~EU6Yl7TV;=66;1-Ts^q-CY2 zG_}_H;VA1EwJb+vrfA75A62dVO|F*1R8q8}b2p4s&U3eaF41}%RlzybX}?fSD_{9s zA#=mBpB6@=Y23e-(QWSk9{)7lkvpx^sJ<9q!ebZnW%5>;3O)0Gc|pV+O%W)o@Shx++e)P zBi`z{MgQPBo4Qrp%)ZU}CCZbzb#=OZGKYS8QS+Cn)>bGgNx@a6% zx6oyT-n_MMhmGvNDQK^iAyc1ZZi*dy8R9SsU@Kb!R6VDOeVBi+ZRU9UeQ-qm^BxfeQE>mQr3j1#O&;qGoxaYv$JPg$1a*$ zW7d~Dx#oOo_=Jk(yUR?!?JvJ)c&9ZvCphUsc4;U5ISE3uou+qm2gTnAn700e<3XPd zaqgSAZ!Gif1W&CoKEHmR#lbP_eDfNnB@XPCKg71Dt$vn;?ZBv>X`8ZP+E&jUv8FAIoAHgn{{!XT#>M~u diff --git a/src/modules/conf_desks/e_mod_main.c b/src/modules/conf_desks/e_mod_main.c deleted file mode 100644 index 2902d3b11..000000000 --- a/src/modules/conf_desks/e_mod_main.c +++ /dev/null @@ -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; -} diff --git a/src/modules/conf_desks/e_mod_main.h b/src/modules/conf_desks/e_mod_main.h deleted file mode 100644 index d73f63479..000000000 --- a/src/modules/conf_desks/e_mod_main.h +++ /dev/null @@ -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 diff --git a/src/modules/conf_desks/module.desktop.in b/src/modules/conf_desks/module.desktop.in deleted file mode 100644 index 7feaf5d29..000000000 --- a/src/modules/conf_desks/module.desktop.in +++ /dev/null @@ -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 diff --git a/src/modules/conf_display/Makefile.am b/src/modules/conf_display/Makefile.am index 8b6b47fc5..93cd4e331 100644 --- a/src/modules/conf_display/Makefile.am +++ b/src/modules/conf_display/Makefile.am @@ -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 diff --git a/src/modules/conf_display/e-module-conf_display.edj b/src/modules/conf_display/e-module-conf_display.edj deleted file mode 100644 index f9f2117922ea0891bdc2c0a698270e082cf25a4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16578 zcmeI0c|4Ty*Y{`AqLot0PSz4CManLu674IKWh_~S89R|S?X;JWv`8uKTI@-iD2b8~ zl@?jDm*x3@}Ds+Cxd3{9qpe(}f<)BV1+)W&lR|YEync!K~0G zdo-umTCf#p3kmdPf~^LVg4j@gzF>Z6V;{816jKHZLwg*=g<{yd#D28Nd8tyY2&YOBJQ0UHZVcqqjWfhnL(Vy%>7Az)gR-yVvY zfa!w?-iH#HDe)sd7(TUfwP z8Z7#szBm`jSTO$H?!cY`b_#lgK;JsBOJIWIAwDG$gWNd1OwD@~jO3M|-$Aef!XURP zzg=LscP=|XF>=mj6eBT1VzU{n3R>{2a1N5>&dFW6QhgDBl3ywI7@FMuCNT8p`gu`) zMqrqS)Ct;IiXk^7No)|tq1Z+o=Rm?poBUwsf(?fjJo`K_@qbt#m;xAy12)yy42;Bq zD0eX4c$Q#T5062U{X~M1J12b;sJ_S-DLaboqZr~=iqx550^1dS$5?np3pQP-r$ z3;2wt-@ZZ|N(9 zkv93k#{Ej)<}>IykVjxS&}8fzlwU2_W5T!{d3`^FmHfjR!QTGEa==Kg3iid_N`L={ z)qs(_6!iN9M%F3Fa7Qv^ul!g;4$)G;NR1@-=1#475||9dNUW3hEn-wgjWB_In1gBm z!?0HwaxY}OGt_uiV35E1VjVKezyxbH#+Pv*43bLql?3xfTQFXf!8U@8g*=6jx#(cX zb#C9o(AWd*BUl17sf9bJ@lwDppgkHA39*BG0lNo{_@|);llZ2614A6qBn0-m1B{&g zcmcMFMw2DAj?19cA#cEN*4**Zsd;g?vNI@FL@~sVtTh9%(6k$|94cOSLEZ!H~nnP*@+2cO2Q-leOhuR{W1~!K3D+2pGSnfZ5WPR}E z^@a9AdCg^6&=VkRuoh^39N^q(`@zWBkE8m{gguEylP7tO zGoxLD;4WxPu<;ao0&N2^1jDz^U$t%*m=fi82%6OXVPF`On{Th6$z2gY9cXTyggyX4 zUdm%k?)y0rn%qMm*j#9COhRK1BnRb}K=b=7iGy4M+YXI&(lQ|7kW{c3ijjWt5afY8v56n)cM^iSAb$p$`~3n<@)r3gPwt%D z8|il%LiTnGn)F4S&<;b2z;d9;`tm4k0QQWslcC8vF}{2S#mJn0sp zYlY_5>?yD@mOQy%lDCs=#mM+%PuTZFPiX!eCtyDV3xnqG?Hue7u>H{7Itjf8Vhol5P41W)pVkgW z?uMT;yJ2^OU4!P|(N5S!U|0|D-(}FJASGar1z0d_Q!w~)bD6C7A!Gnp6*PYil82}v z6F)(7zb&9QK@Nj8L6e$9=E7Z&{8StQJrY93DunogjfLiqM`96mNRiwJ|KIB*M{(AQ zWG?=>kh8>nDlUX3_esXb*^xCXu7nnaknxKlxO+ucXl^})WhmgI!rWhH&5|RK`2hGoYKiEUTz7tKwuG&P7Q9dJKg4R6|n1w4upCUHu9njy#;WesSOGsLF_f}Bw{ zhaL$bK0hFc4P|nEWFF!})4qeMkyt0|BR)SNh#}=$6eB*rAedA6J~TN$;?o03 z1$zZe;)VG1LJ&jBBz6cRK7A0xkTSUkvKHdg4?!F#ll7B%;X{WawhA#w48ey^>{u{z zCgXTM^Z~HZS4A0GjORlaf}IRDi}HgHeIRUkFl%Vs9r2-)yM6*@Pcit=$vxxjR9Mht z4*1ZAz@7-UmGXlRT^KfENaZjz&VcyPhr-SW!`viZh!36Yo3Kk1gAbkT+ZgORH13l4 z(8-;ef@MQvf5eAQ&I04B6hlwo`OrtfJ_c3~jpxLNPR<8+sY1?=^n(wboDmt1oGlp- zK6DbZ;rOpb;!ox!oZKJoQdJ6?^do13b0jgOI*IZl`x^^e4{RnhnS-1)&WFsaYD_Ws z(8XaVfh~Y0Yl9DcJZ!{}>MDxChmQSl=Vd~Z@!><4fQ=YZ4TL6VLiQ{PI}I$7V(_7p zwIYU8cSDo4z=tjk`wZ9-XfiK+=p-LutDc4?`-cx*7IrMyHE6On_|S2W+`bQ?$-dx2 zmxqmeRIPv}e(<3yzy?=sf+pt#n?4aXVn_{&%iu#-gdGJ&&YSdw4_yg1w3-U#2OqjJ zY>ca>3r)@dK6LUN@uFr0O=1W>bXAJkPz*kFGNCd2mP3=fgb$tEmnoP7G`U;&&?mz_ z4CV_>&J#X#b=b$ic0!Z0f)9NPY}}<9IX`ly@S$tKCgYugCgZ_}t_d44q;?gW%nKj7 z7Hq_jS|&7!A^6az!k!KGl=6cQeHv`UkXku3nFBub>9EPXwG<;hG^XtcV})NCnpT)|h#i3Wi^>50h{EIItbOXztE5bFv02vQWlc zcQzKuVh1zKx!p)-cdYC`x$ri@aCYZS#`CdtVEZx5e(&|a49FemzjYEgCGNOfZwqoD z+ykR|J9sf^+&wT|T(D4@7t5c+WH1A;P7aOD^uYn}TkfvjES!alr-Lhp#&L4MAU-U2 zZ$BoR;l*-B13Ps`XLk<6-J9bM;^gV>!|-Dlel(6B9%*t{G&N|dkNQ-K1UPv5Gid?t9Ct@diAS2V$U_HDEJ!nm(!n$r_aLUT zW+0{AXkPB#Xpz6L9fF9Bzit?m>4R=u6^!AgaR=l0VE3Bvra4fi1BT|A*q93ffX(!r zriniee(nKGM$kX)U|yT$;=*D2@t;yH>Y2MUpTpv^>Hmx;(59XXjyGLXaJ=c7{PDO} zFz-eIX^t$mGn1|9$v4=1!;fz`@(phmNeWLKny05G$BV`CbK}`QEDi&E#e%tyNYlZQ z!*2>a5up4&&n?H&+-$xrhe#{_0O^$mAGJ#kw?&SV{o54I2p~0ubcJ=6e4bi}#e@4i+e`bD10`w!05`lkjU1 z!x@a`%yw|)juQ08BxM6P{`-*=%O9mo00jSe#`P6w^L+mSF7Dnana+QD@oFzYXkb)yW61Q6H3DZUg1o4eu8;*env%3@7Xl zWtC5Yep|u6tq`t-dm&C#c_OBRr;nQh7jmb-j<^j+2PY3Ff0Q#W)eQ0Rbij%68ZIon zv8Wn}3QbwROC|Sps7W>P{v|JOe)At^$G@NQOXy!+c&|qu;uSYuZ51H=Y8gZg$93b^ z%)cP1oPPmc&HWE!@m~UejrA8KWBmnqwOC**2W~|c032Rj79iZ}{O7|%Ac1&aJ-i*! z@G`;u^8Wr#nE#YO{2ciE3xi2M@2F1;-gm~I;AhxUgnX58GlAym@4(jbd`7H6|ejt&Y`|rNbs82ZVI97ju-H}%i^)(6;B|&qEx!E$4 zMV1TAsrEASRm&*T%G$(|kC(1AS-8+Yp6?pC!$I zOp*W3Z1^vMPldH$ka7e8y2)ud0m|>@VGHQ7qRgo2|6U@c!9ts~cF? z-1BM^Y2ABbKC#S{LXt$229@qOC3#iYSGeWa5&7>neV(pK#qL2$cHL!*?qm(@eOz*2 z%BUH7%h&9B5bm;nhI{xeZL>AA2fA)pF~{Z9Ezi;;r`IltTM(CgQ@u!4GqKC`*?g<3 zHzwAMd3Is%lIm${uE!e}``&R`p0QcyqSEDwzOQ1JXG)G)dU5rG^2Ol>zCyl=zG7e8 zRlF6vmAy~@`Y1XzB|yJNu4FnQv(?1 zhTkw9A8>e|``&`AMGtS8Xgyc?$XeW|^Remq@M{ao*GIQC9;_1j+8OiHAgMRn{imwh zr$f8q7hmN}4loI9mW@gFEiWk^9FBkZ#%K*y_c>#a_EGG?-flaO=b_=reeOhK#91v~jYA{f!u%REFifz@{^*u zn!NmagS3c6i;DI~iO7}Q_5XH$^>vrhB=h09CRpmD$B%c$#m7H>_3AK=PxZDBhog8e zSfMoKsA}eqC+ek_*6KFDJTV}rSh!hCPIrF(u@}BGbPNs`L_bZ+ND*@{YA{`sxk1_M z?cHr1P1Tlib{X?lrrDphG3?%&^Fqazn4lo~v8O`aanuwvKL)|z@%+<3uW-)%oY@2rTDoA7(> zC7q4$9zT7$JEZ-qxuKz9X*!GXwL05qW zaeT{9*S#{KJuP()yH4CYZ*@>*&8UWkhI#CqU&id3udj|TEIzyR<;caQcQ~$_#SI@s zrl+SL5n?c^lV@!T7$$q=)>ui&U11U?qeqV(J8qo$ix)3uY$#Qej6Y`Vp7Qwh%GHMs zAJ^RMucoNDZBhK}2N{cOg(BowO>Z*#BvMiys!yK$IkU4$QC(d3~l; z3R%%PX?pP%GNA#=A|fIhL$L6~1cT569}*ea;YxZFX1IxV%%fS2GBq{5AwAc^Vpvb1 z$?|EhvyEho!uM?6vSoN_PSd-KD-F{kT-H=fDu|X=96o$_F1;h}`2f2RH*MWjHTBYN zho^0t?f>=6$4xhl**US#lWpVvO2+4AkS8|WPQn>oeB z(Z__!HY=EI7v<#qTHn?Deyq5-MPX#+kh^SozaUXmfS563#;iCWDfdg~M7fd1%=X&T zmeHTvzPvp1!c90UdWwd|PQB-6qdIcm&Eu%-ouRt)k^AkV=ZBteHyyr8eKovijXKjcIeV4=y=y(CBVNf7ba|Dk`|&Gvf0g zKGsv`9GSv4F59|KX3l{R#?}VQ*rH-GCQW$}xkjGLg^a?irEi=pICsvz_v^*9x$%+X z70C6h7CRJjUT=m)&C!{3!|h5#<{Ny_KR;hYPvk<0S&@)(Kwn_PdAEu?oH@^8XMU5J z*?e!-9Fh8Vn*~;P`nu~+4wrLucAk4cC}mLGkR`*FhPZ@^4Gd2XxSS_-)9dXKC9qi{ zhe96BJT=+iLu|9Y!JgeRRwr~0muwz1yyIe|+)RUG#na&_a53aQc6eZab!wL z$|3{jQH7oP!+I{wzHRuCcPy>OWdl1b$m(LqXnS_=jkL5gQ(uuf>%!pht}sS{$jA&% zUBSo~otZs9o;tg^%_}GHF-IB9Whdnkg z5m7H6cviOH;lq+Aho273EL%OZIsMAb@AtbF3&~v>QXhV_ygDbx_$dyG99FCK{sGx` zM|EZ!TqB@FaRE!|TM}1!Y%Y;g$$ywDSDcLM&R8K7@lwTFU!s3&TwK$g&TRI_UC*-y zkCb%Ni&-Q8Eh%;Ar?aC6L<|>M885qfL*(Vy#8R_Q#y{`Ze^E$_aCpD4<4bvI4vXpj zW@x6?N9*GgZ^&IAwYamrz1@n9FwDPme8uo%LapNz21HzM^xA59q-tKr(B)qg>Lc5t z4!6g&uFttb`zmL!EXet+EL(Pu;SHsPphhDhhPxa#(= zuM|J!5NC-&RW-^TU4S}$!!={9u+s{=i+bqeIKS5L{}(@oVhiruT;}t)PJ6ceEQYM4+#=; z)^&fsqUDlB0pc5*bB8ceBISOTZTOMD z^N^9#U>U=(+namkiVeRWpAggH5n0QbTF~#mDq)^tangicJ9eF!=45et$m~Ajkv)&T zi)VCnzf8WrvLPd)Hh*ZO-1Wg1F0PCoG5Fqr$NN5SsH+cu-Y~BuVq16C+-qw6%2PV` zsf<#e`!c>|qGy1zsO9x{J4?etH#e6R-g#D~#6BTsEo8Y(IJ)qryoyR}OmekQe^bKK zi4UK-jvFgF#ARvc?etnb5sR#4_X4~wtWDSa@~T|*ey&$a%a2peZkJA3=!iR)RPI{n z+BMXEN?64%gZr|pLlo__w^S!ZT^>I1k-DL6+tB$Dk6Jg!#5g$WtUYb9x7t8tK)AK9 zgTk}I;^dhgWtE0O&GJ{h9maN!9WuM!$B_|PU6^fl(`7JHAU3h>5!9Rg4M$gtFtZE& z_unrrKI&ba^{hQ*=djSkvdzJ*=iSPttjP-NzSLPA!3Yx1NIS9x<OcEt+cuH<;`jv*%*|H@G*xMAxSn5J{MuEiE#{`NP4w6DG@C+txp|q|!BgH9 z;oYmXh4d^}ggAfM>lf_&al~>x?V9id#gk)f3`%nt%T{%btb6#T+`Mq*gUTg48SKPY zWjT z-Q4k(wR`n)W>3$}YbsY{CAZ%h+EY+t@@4i>;3A` zO_E)%AM2~v4d@Z$aEd)EZdjE{+jSkD8QFU(GW()xeP@`N{Z^zop+g@x)?Z4svQuETlKHs{6_&kZUW0otnoy^v1x2=9^ zU!%LHX>!|@+2rJoxXv#`rAm-kW+@WPYF;gqVVg0ztMx}w+Um?THCmG7kB>+C@*FF8w%SN?_&fjZ(giyF>AoxjeaO;>q3Fi>#;X#VR#lAF^TA&FC`41rcg` zL1iPB2N&a={lWOlew4eDIbGc&Zk#{wmLT~}q_QddPO!Fh+^m+uI6cmDMuA&z)Ab;? zS)rT6v$FyhTtd{xbmGne&v<2idGO$`g+@e z>21BYIeyz(>ZJM>+e^7U)JHT`I9WeF7CsV^Xof=CEsd_9>?e ze)d*%P8cn|B21WLllsPW`TK-vP6Z;*lOjyi_r2fuM5pp?(8$)~lb-L2PknGZoiifg zyK33=D#hYqsjfv$y@eb448LC0ZVT{U!)8w^s&#Q>C9jW;lJ5*jbeUuNaIb%_L6Oym zrjc3NJM2FyHh#Gv)@-@OKeM{}d+2$)j#Q^q|JN5gUneh9tr_00)qMK$NM{45UNeoL zy!OP|^plLi{YMA&Iqr8l-P{lzyySHD%b#Z14ZbXoQRUucBYJ+RW<5PSBCGDx$5&=S zo60`7%1EzSvLH@_on5?fM6usl)lKymHf@h9=sU4j;*?g`)GqZFdiJLsH?6m+hDue0 zM|mif7o0MQyuEvT@pWMz(SiM+w&*3yDH8oYb;yhd>-IDqn6Tcka>o>nLf@!IlC82U zeRcO4j6TU~%{=$PxzfM))wgLUgZfV<-c-%C936H@q)4t$wf|vGS&`+{jH7*93A>%#DFNIFXS}zq=zot;) z=&Ag%HNj)1x++W`eW6hQ;$sJmjC~#q_0n8DO|NyVj?UIh{m_mExmlKP#-BTPZkSDR z;H+SSU`A+r+eF>K^kJ?mkDf&Ih2QdUw>eU_!sx_?h1t4OXJlMVP753~;mtjkNyc`y zxgRDj5na4PVMo=DB4O37Gm{i*MOrrnvFt?pLPv@o*>ObJrtPw_x83Y_BS#F&*xnOS zm^om^`yrKYyDKib7N^Y#_UjuRbaK_IHB~w@boBRzX$&db+htd9M|AO?WBY1;efzRw zR=)7S^0{(z$8Q~;q?b4FR8*I`e%EDsg!t*$n;Z0ESFf7#rQ}(whZd{p*P^0Jax-sU z)!P^9=#lugt~qx7Tv5l*X~h`{eZq`^P9HdPMCQ)fs+c5^HzGH-Sg$iZXuX~F*Dv4F zAIN?zUMG}W+|wWTy1ab(zz7Y-mWZsNjP*5xgtR7faU{A#o^1VO5maFvvtYyhsiNCo zF|ALn6gAxBliqRJzEpJnwaD z48wGuQA2_DkK!jkWV%B?Mp>qwJXY~!HC<@ZwVusKv<|60vlMPyvUt9B`i+FGGYgMj zJ=fdU{(SiY<Gt6 za3X2GaGs6k_sZC5rXQw_jPa?xzH6q}s_R}EgGEL~dwmh}SQ1d)*#7>req7F$(X+k; z_v`dX{je)sm3HTD?~dA4SEex6ULM{zvRlYY!zntbg45Bw=uO_E9G@+bk-2Z~pEw~j zPfn=zw5Xx>j^cs&h4aEhPmIp98BHsx*dwYlJm%6M=1STdecPFO#y@9ljUQYRG3Jz! z2JOj^6b`*4Ii@mqSpJlG9oH1vBD)*h!bDv*HESDt$|QbJQ0pHMqqF($cj1_4Q7**_ z4WBl3-`#V*hvW7mWY77==ax$&Mq6jnV|$o0y4Br!F1m%8o!?0Fx6rcZEwMWBonb+wX_gxTQW+(OlhTx#Q`$ogvb!Sq!COCk^FgkzdrOith}I(XhVHCekEK#piTP^J zEU$h2$>Xd`h4k9~fL%@UjY^Gd&%lniKD2wny~0AmMnN;S2%8Dt58rd?#JT(57O56J ze{c5s^v1oPr@GF*^`PS_`^ex~bDxgRo2CG|O%kCR^e zT;A?*FK^DlHYA^cJ3O1(R zxnD6zWl55!?qQu5N|GlZ2hZPjanWht?QyO<8J`UcUu>M$qLsdFnf~b+Tm1^V=O;@H yeKyf_l&MOdzNy5%`vZ>D?p>>5uVAli&+$CjV6$ID?bbf8Lnn0lXf9fhL;nw+GoSSU diff --git a/src/modules/conf_desk/e_int_config_desk.c b/src/modules/conf_display/e_int_config_desk.c similarity index 100% rename from src/modules/conf_desk/e_int_config_desk.c rename to src/modules/conf_display/e_int_config_desk.c diff --git a/src/modules/conf_desk/e_int_config_desk.h b/src/modules/conf_display/e_int_config_desk.h similarity index 100% rename from src/modules/conf_desk/e_int_config_desk.h rename to src/modules/conf_display/e_int_config_desk.h diff --git a/src/modules/conf_desklock/e_int_config_desklock.c b/src/modules/conf_display/e_int_config_desklock.c similarity index 100% rename from src/modules/conf_desklock/e_int_config_desklock.c rename to src/modules/conf_display/e_int_config_desklock.c diff --git a/src/modules/conf_desklock/e_int_config_desklock.h b/src/modules/conf_display/e_int_config_desklock.h similarity index 100% rename from src/modules/conf_desklock/e_int_config_desklock.h rename to src/modules/conf_display/e_int_config_desklock.h diff --git a/src/modules/conf_desklock/e_int_config_desklock_fsel.c b/src/modules/conf_display/e_int_config_desklock_fsel.c similarity index 100% rename from src/modules/conf_desklock/e_int_config_desklock_fsel.c rename to src/modules/conf_display/e_int_config_desklock_fsel.c diff --git a/src/modules/conf_desklock/e_int_config_desklock_fsel.h b/src/modules/conf_display/e_int_config_desklock_fsel.h similarity index 100% rename from src/modules/conf_desklock/e_int_config_desklock_fsel.h rename to src/modules/conf_display/e_int_config_desklock_fsel.h diff --git a/src/modules/conf_desks/e_int_config_desks.c b/src/modules/conf_display/e_int_config_desks.c similarity index 100% rename from src/modules/conf_desks/e_int_config_desks.c rename to src/modules/conf_display/e_int_config_desks.c diff --git a/src/modules/conf_desks/e_int_config_desks.h b/src/modules/conf_display/e_int_config_desks.h similarity index 100% rename from src/modules/conf_desks/e_int_config_desks.h rename to src/modules/conf_display/e_int_config_desks.h diff --git a/src/modules/conf_dpms/e_int_config_dpms.c b/src/modules/conf_display/e_int_config_dpms.c similarity index 100% rename from src/modules/conf_dpms/e_int_config_dpms.c rename to src/modules/conf_display/e_int_config_dpms.c diff --git a/src/modules/conf_dpms/e_int_config_dpms.h b/src/modules/conf_display/e_int_config_dpms.h similarity index 100% rename from src/modules/conf_dpms/e_int_config_dpms.h rename to src/modules/conf_display/e_int_config_dpms.h diff --git a/src/modules/conf_screensaver/e_int_config_screensaver.c b/src/modules/conf_display/e_int_config_screensaver.c similarity index 100% rename from src/modules/conf_screensaver/e_int_config_screensaver.c rename to src/modules/conf_display/e_int_config_screensaver.c diff --git a/src/modules/conf_screensaver/e_int_config_screensaver.h b/src/modules/conf_display/e_int_config_screensaver.h similarity index 100% rename from src/modules/conf_screensaver/e_int_config_screensaver.h rename to src/modules/conf_display/e_int_config_screensaver.h diff --git a/src/modules/conf_display/e_mod_main.c b/src/modules/conf_display/e_mod_main.c index 0aadcfbf2..914855e69 100644 --- a/src/modules/conf_display/e_mod_main.c +++ b/src/modules/conf_display/e_mod_main.c @@ -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; diff --git a/src/modules/conf_display/e_mod_main.h b/src/modules/conf_display/e_mod_main.h index 90487c1af..4c429178b 100644 --- a/src/modules/conf_display/e_mod_main.h +++ b/src/modules/conf_display/e_mod_main.h @@ -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; diff --git a/src/modules/conf_display/module.desktop.in b/src/modules/conf_display/module.desktop.in index 4d91e3b38..c311ec085 100644 --- a/src/modules/conf_display/module.desktop.in +++ b/src/modules/conf_display/module.desktop.in @@ -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 diff --git a/src/modules/conf_dpms/.cvsignore b/src/modules/conf_dpms/.cvsignore deleted file mode 100644 index 06d064a84..000000000 --- a/src/modules/conf_dpms/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -module.la -module.desktop diff --git a/src/modules/conf_dpms/Makefile.am b/src/modules/conf_dpms/Makefile.am deleted file mode 100644 index b9fac7e36..000000000 --- a/src/modules/conf_dpms/Makefile.am +++ /dev/null @@ -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) diff --git a/src/modules/conf_dpms/e-module-conf_dpms.edj b/src/modules/conf_dpms/e-module-conf_dpms.edj deleted file mode 100644 index f11abaac6791c963c5a7ca78efabc69d1b7c071c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16958 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 Rvtr!hPs|^rIck&!{vUS9eaZj; diff --git a/src/modules/conf_dpms/e_mod_main.c b/src/modules/conf_dpms/e_mod_main.c deleted file mode 100644 index aa169ffeb..000000000 --- a/src/modules/conf_dpms/e_mod_main.c +++ /dev/null @@ -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; -} diff --git a/src/modules/conf_dpms/e_mod_main.h b/src/modules/conf_dpms/e_mod_main.h deleted file mode 100644 index 8c0d2880a..000000000 --- a/src/modules/conf_dpms/e_mod_main.h +++ /dev/null @@ -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 diff --git a/src/modules/conf_dpms/module.desktop.in b/src/modules/conf_dpms/module.desktop.in deleted file mode 100644 index c9969e339..000000000 --- a/src/modules/conf_dpms/module.desktop.in +++ /dev/null @@ -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 diff --git a/src/modules/conf_screensaver/.cvsignore b/src/modules/conf_screensaver/.cvsignore deleted file mode 100644 index 06d064a84..000000000 --- a/src/modules/conf_screensaver/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -module.la -module.desktop diff --git a/src/modules/conf_screensaver/Makefile.am b/src/modules/conf_screensaver/Makefile.am deleted file mode 100644 index 263255d5e..000000000 --- a/src/modules/conf_screensaver/Makefile.am +++ /dev/null @@ -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) diff --git a/src/modules/conf_screensaver/e_mod_main.c b/src/modules/conf_screensaver/e_mod_main.c deleted file mode 100644 index 4e97cdf0e..000000000 --- a/src/modules/conf_screensaver/e_mod_main.c +++ /dev/null @@ -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; -} diff --git a/src/modules/conf_screensaver/e_mod_main.h b/src/modules/conf_screensaver/e_mod_main.h deleted file mode 100644 index b739a4365..000000000 --- a/src/modules/conf_screensaver/e_mod_main.h +++ /dev/null @@ -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 diff --git a/src/modules/conf_screensaver/module.desktop.in b/src/modules/conf_screensaver/module.desktop.in deleted file mode 100644 index ca63e68d6..000000000 --- a/src/modules/conf_screensaver/module.desktop.in +++ /dev/null @@ -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