From ca263be347bc852d629aa05f8ef7951c18adcde6 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 7 Jul 2007 15:44:01 +0000 Subject: [PATCH] move more config dialogs to modules. SVN revision: 30640 --- configure.in | 6 ++ src/bin/Makefile.am | 8 --- src/bin/e_config.c | 3 + src/bin/e_configure.c | 6 +- src/bin/e_includes.h | 4 -- src/modules/Makefile.am | 5 +- src/modules/conf_colors/.cvsignore | 7 ++ src/modules/conf_colors/Makefile.am | 31 +++++++++ .../conf_colors/e-module-conf_colors.edj | Bin 0 -> 3634 bytes .../conf_colors}/e_int_config_color_classes.c | 0 .../conf_colors}/e_int_config_color_classes.h | 0 src/modules/conf_colors/e_mod_main.c | 62 ++++++++++++++++++ src/modules/conf_colors/e_mod_main.h | 19 ++++++ src/modules/conf_colors/module.desktop.in | 4 ++ src/modules/conf_fonts/.cvsignore | 7 ++ src/modules/conf_fonts/Makefile.am | 31 +++++++++ .../conf_fonts/e-module-conf_fonts.edj | Bin 0 -> 3634 bytes .../conf_fonts}/e_int_config_fonts.c | 0 .../conf_fonts}/e_int_config_fonts.h | 0 src/modules/conf_fonts/e_mod_main.c | 62 ++++++++++++++++++ src/modules/conf_fonts/e_mod_main.h | 19 ++++++ src/modules/conf_fonts/module.desktop.in | 4 ++ src/modules/conf_theme/.cvsignore | 7 ++ src/modules/conf_theme/Makefile.am | 33 ++++++++++ .../conf_theme/e-module-conf_theme.edj | Bin 0 -> 3634 bytes .../conf_theme}/e_int_config_theme.c | 0 .../conf_theme}/e_int_config_theme.h | 0 .../conf_theme}/e_int_config_theme_import.c | 0 .../conf_theme}/e_int_config_theme_import.h | 0 src/modules/conf_theme/e_mod_main.c | 62 ++++++++++++++++++ src/modules/conf_theme/e_mod_main.h | 21 ++++++ src/modules/conf_theme/module.desktop.in | 4 ++ src/modules/conf_wallpaper/e_mod_main.c | 2 +- 33 files changed, 390 insertions(+), 17 deletions(-) create mode 100644 src/modules/conf_colors/.cvsignore create mode 100644 src/modules/conf_colors/Makefile.am create mode 100644 src/modules/conf_colors/e-module-conf_colors.edj rename src/{bin => modules/conf_colors}/e_int_config_color_classes.c (100%) rename src/{bin => modules/conf_colors}/e_int_config_color_classes.h (100%) create mode 100644 src/modules/conf_colors/e_mod_main.c create mode 100644 src/modules/conf_colors/e_mod_main.h create mode 100644 src/modules/conf_colors/module.desktop.in create mode 100644 src/modules/conf_fonts/.cvsignore create mode 100644 src/modules/conf_fonts/Makefile.am create mode 100644 src/modules/conf_fonts/e-module-conf_fonts.edj rename src/{bin => modules/conf_fonts}/e_int_config_fonts.c (100%) rename src/{bin => modules/conf_fonts}/e_int_config_fonts.h (100%) create mode 100644 src/modules/conf_fonts/e_mod_main.c create mode 100644 src/modules/conf_fonts/e_mod_main.h create mode 100644 src/modules/conf_fonts/module.desktop.in create mode 100644 src/modules/conf_theme/.cvsignore create mode 100644 src/modules/conf_theme/Makefile.am create mode 100644 src/modules/conf_theme/e-module-conf_theme.edj rename src/{bin => modules/conf_theme}/e_int_config_theme.c (100%) rename src/{bin => modules/conf_theme}/e_int_config_theme.h (100%) rename src/{bin => modules/conf_theme}/e_int_config_theme_import.c (100%) rename src/{bin => modules/conf_theme}/e_int_config_theme_import.h (100%) create mode 100644 src/modules/conf_theme/e_mod_main.c create mode 100644 src/modules/conf_theme/e_mod_main.h create mode 100644 src/modules/conf_theme/module.desktop.in diff --git a/configure.in b/configure.in index dd89333c8..1029a7ab2 100644 --- a/configure.in +++ b/configure.in @@ -252,6 +252,12 @@ src/modules/layout/Makefile src/modules/layout/module.desktop src/modules/conf_wallpaper/Makefile src/modules/conf_wallpaper/module.desktop +src/modules/conf_theme/Makefile +src/modules/conf_theme/module.desktop +src/modules/conf_colors/Makefile +src/modules/conf_colors/module.desktop +src/modules/conf_fonts/Makefile +src/modules/conf_fonts/module.desktop src/preload/Makefile data/Makefile data/fonts/Makefile diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 53f1a4ede..671648b10 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -119,14 +119,11 @@ e_slider.h \ e_widget_slider.h \ e_int_config_window_manipulation.h \ e_int_config_window_display.h \ -e_int_config_theme.h \ -e_int_config_theme_import.h \ e_int_config_icon_themes.h \ e_int_config_menus.h \ e_int_config_keybindings.h \ e_int_config_mousebindings.h \ e_int_config_cursor.h \ -e_int_config_fonts.h \ e_int_config_startup.h \ e_int_config_performance.h \ e_int_config_winlist.h \ @@ -135,7 +132,6 @@ e_int_config_desklock.h \ e_int_config_exebuf.h \ e_int_config_apps.h \ e_int_config_dialogs.h \ -e_int_config_color_classes.h \ e_int_config_mime.h \ e_int_config_mime_edit.h \ e_int_config_screensaver.h \ @@ -279,14 +275,11 @@ e_slider.c \ e_widget_slider.c \ e_int_config_window_manipulation.c \ e_int_config_window_display.c \ -e_int_config_theme.c \ -e_int_config_theme_import.c \ e_int_config_icon_themes.c \ e_int_config_menus.c \ e_int_config_keybindings.c \ e_int_config_mousebindings.c \ e_int_config_cursor.c \ -e_int_config_fonts.c \ e_int_config_startup.c \ e_int_config_performance.c \ e_int_config_winlist.c \ @@ -298,7 +291,6 @@ e_int_config_dialogs.c \ e_int_config_intl.c \ e_int_config_imc.c \ e_int_config_imc_import.c \ -e_int_config_color_classes.c \ e_int_config_mime.c \ e_int_config_mime_edit.c \ e_int_config_screensaver.c \ diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 20b776e72..a8f0c453b 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -755,6 +755,9 @@ e_config_init(void) CFG_MODULE("temperature", 1); CFG_MODULE("pager", 1); CFG_MODULE("conf_wallpaper", 1); + CFG_MODULE("conf_theme", 1); + CFG_MODULE("conf_colors", 1); + CFG_MODULE("conf_fonts", 1); } #if 0 { diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c index 90187208d..1e9565840 100644 --- a/src/bin/e_configure.c +++ b/src/bin/e_configure.c @@ -423,9 +423,9 @@ e_configure_init(void) /* FIXME: hardcoded - need to move these into modules - except modules config */ e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance"); // e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"), NULL, "enlightenment/background", e_int_config_wallpaper); - e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL, "enlightenment/themes", e_int_config_theme); - e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL, "enlightenment/colors", e_int_config_color_classes); - e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL, "enlightenment/fonts", e_int_config_fonts); +// e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL, "enlightenment/themes", e_int_config_theme); +// e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL, "enlightenment/colors", e_int_config_color_classes); +// e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL, "enlightenment/fonts", e_int_config_fonts); e_configure_registry_item_add("appearance/borders", 50, _("Borders"), NULL, "enlightenment/windows", e_int_config_borders); e_configure_registry_item_add("appearance/icon_theme", 60, _("Icon Theme"), NULL, "enlightenment/icon_theme", e_int_config_icon_themes); e_configure_registry_item_add("appearance/mouse_cursor", 70, _("Mouse Cursor"), NULL, "enlightenment/mouse", e_int_config_cursor); diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h index f05897f13..3625e7d13 100644 --- a/src/bin/e_includes.h +++ b/src/bin/e_includes.h @@ -88,14 +88,11 @@ #include "e_widget_slider.h" #include "e_int_config_window_manipulation.h" #include "e_int_config_window_display.h" -#include "e_int_config_theme.h" -#include "e_int_config_theme_import.h" #include "e_int_config_icon_themes.h" #include "e_int_config_menus.h" #include "e_int_config_keybindings.h" #include "e_int_config_mousebindings.h" #include "e_int_config_cursor.h" -#include "e_int_config_fonts.h" #include "e_int_config_startup.h" #include "e_int_config_performance.h" #include "e_int_config_winlist.h" @@ -109,7 +106,6 @@ #include "e_int_config_intl.h" #include "e_int_config_imc.h" #include "e_int_config_imc_import.h" -#include "e_int_config_color_classes.h" #include "e_int_config_mime.h" #include "e_int_config_mime_edit.h" #include "e_exebuf.h" diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index 2f8ae2240..e5710a2a6 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am @@ -10,4 +10,7 @@ cpufreq \ ibox \ start \ layout \ -conf_wallpaper +conf_wallpaper \ +conf_theme \ +conf_colors \ +conf_fonts diff --git a/src/modules/conf_colors/.cvsignore b/src/modules/conf_colors/.cvsignore new file mode 100644 index 000000000..06d064a84 --- /dev/null +++ b/src/modules/conf_colors/.cvsignore @@ -0,0 +1,7 @@ +.deps +.libs +Makefile +Makefile.in +*.lo +module.la +module.desktop diff --git a/src/modules/conf_colors/Makefile.am b/src/modules/conf_colors/Makefile.am new file mode 100644 index 000000000..81b11a22c --- /dev/null +++ b/src/modules/conf_colors/Makefile.am @@ -0,0 +1,31 @@ +MAINTAINERCLEANFILES = Makefile.in +MODULE = conf_colors + +# 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_srcdir)/src/lib \ + -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_color_classes.c \ + e_int_config_color_classes.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_colors/e-module-conf_colors.edj b/src/modules/conf_colors/e-module-conf_colors.edj new file mode 100644 index 0000000000000000000000000000000000000000..a59e24c6146505f8689ae61e1dbed188d8aa49b8 GIT binary patch literal 3634 zcmaKtc|6qH|HsF6r!g|Jmo+LySyEToW>S(wBxEPXk}Q`nLLW4CQjsKuZrQG_n>2)B zxPz22Dr6heAXyqqW`o(u)tt%fAr6!SR_Bg9}ZdM zSB3m~JKFaO+A|_FGTa9pvGwi!OF-reYWQu@9|FI?t7r&jG(P`b$a|DTx7=>BS*iK< zXC)pu_3C{w*aU1>vO)dtD1`K!all2gLrYrRnkL&O6hx8lDEPhwl zJ&fh-=b?BHqYis6H>ce5ZP^W%1|LZcs>#hReI3_7I-MjjIIvx!u~bI>T1uMCDdgt5 z4A1JLU`!=tKp^q&u5GdFk`#kDE!9+|Bl5%nt*1&2D0Gt3(V&Rlh^*zT93n#gdBWY0 zpa*iQjzrmhj&r=l`17cOAz>4kM94_|qL@AZO;x`9cj+M>ZITeDY`A=ek)>qk0OG(U;2PI}@lI=00HqdoEk zeJ7y@HZ!bvgPPT-Sff9Rs}hw7B*J2uUDONR*MWHxZ_)l-Vn)VVLAIX({6%c}g1OWA zS%>Ttt4Wyw^t${au|)A^pFmr5JvF9xest%;t8-V6-Cy96c>&&i=C>?U6%1D#nx)D4 zJA1`N`)}D11T6PN9=^LP=jpA};X;Zbng_iBcg9+`y7h$e+^XA3;ljro;wNNoqQ&;_ zyz)Nb!Q|g*7h%r(_AvC%bKXiJ*SbiGT;oyo{iXLGcp*YWCS6<(+sDJ~cXZykGZGk8 z&-VIsCL*h$NZ?Ul@*u6O=yPPC(j^%$QH0&ceiR$oK?o&2tT?q>f zl)$q-r%y%^w2$>fr@Id>-72j3(^+XDP-8LaY?IaEUG3-(T`zUxf6KV#C>=_yj`sKR z+MHe4cbyib)fUWg*j7~O)BoXszYRw*b8k>Ph{3IIXQ(K&RlA-ZTlpPcHv_4&sBbE< zc>aQ6n#U9JTy9WX;we=p@Q?FWfPC9x;J*zcu=L0(RN6v1dHX&+qJ;0N+6BpjD8Vrl zA;{vkYD-pUhV@qwIPx2AIC^1uA6 zW@qD$3H2xFhs}v8lJNsj#lkb)KncPvoeCPWm^rd<7uH9F<4TyD36^?<-K?xP6V)pY zhNqRM1+cR!RV}IqWs3%a6s($upbfOo#-CG!+$z-V_T{)PH8Q(FQo0&`4Nrh93 z!t8K+sznzLxshX325x0uN`Ejyg~%PVL)?N-i`dS(IJO0(mwkviq8w?f696wYSxPCo z)A^8~M18z$i#cdqSzj8iV%vQxtLyCBE^#QX9TuVjYluc2H=+ldL)D?@Bvy&mK&6v(-@YVr8Qyfpz<1R z(xwMWS{@hB3t6QHMxW@p497#zn3D*A*se2SS&$RFvgurcXottSqc%b=v?0?Kcu;GyY&N-hg4aZ3wVS+0 zQ*ZF+JK&*%g%TXRpCzo`#Kuw5?*g}y{ylmK22_ojMY2p9rRaPVv}QGqZ>X#%6cP_WK$Y6Y03 zgG=Dz503+ZWe%Q;=Ys9}17Z{&iFZD-ordoQazJG;W|sB^c{WMB4L-=@rE)#rn~Hrq zSGc+1`OKv^^{2#y7t3)eUTX6c9iYb> zU@6;HTz8N_he_`=^S}Vm3Ffrw4f_A`a`ESikHHt<8t4C+DyMmB1J79lJV10K0Qz%Z zFVNR1Rk5kNWsjEGQC?vKhXL1N3WnRgJHz9jgWJoU!8=D!+!w9`U1q|1%mbU$uepOV z-1FN!z?hyVPS36S_yhcc!|FhfpZP=le7r}oiS|MGB1(^aQU1+`_?LX^x1ly^qB!ow` z{W$7p0r$yP8*V#vK-&gBj?j&Y+grWui%7UL?MXj7!EoQ3u4Xj}BgH8}4P2>F{O*#X zM>>W5a9YE#>yYR19v2E?u=qNahooboZNVJgcf|K(1`xvuaRM#ILdU_q1%iRL68Ll` zkd4qdR>@Mn2Fk?)K0J*RqPwK?a?;n3Kl^Jdv%nc;Xm;SjOGH*1WepFzh7cWOJzG9E zcNpwz-OcP^d48K|0YmqMm(&f06@Ed^kxc4~LGg?9sFA_d>}4~Yj+^Yj55&QUV9RAD zax`6WuBl;shrEz73{v ziB=>&qKr*C`~9&ItwF%mi{57>h>!FO29A`~&^Bl#Zzqv_RO_$M5pLIQUVuWeNk{(mo<8y)KiF608|=hyD!I@}8t&DzbxrV28p#_fOm z{o=R(CiwoqPGaO8_He+Wm#J?YqLX7#L=$n)?0T(b~BdM1{|j zbN{}|Hn46Hq7mvrkn=_ggHJ6@eBS(nz^d7ps!pFE7aEK;@hwoV=x8z9dSD;?dtKP! zdqsi;e!k2*M{|PMn?2t;*s7}p%H44(LF~gsss3x z3ofgV8!ueyEc)bP=%Ir=nY+vTp5TsWM`b2jCMMMX=@EZfr&KkI%h}00=xjOJvxp5K zH%th<4HJ?&dH!{kwgmRRcC6_`J+o;iqp*BOVFE-|keCqYyD7~i{^<5K=)ujm>f zv@p7Y8u6Y$xtuNIGV%Jmk8F#JYSepGu1!+B?M*@-WJ5|YqsciY;sjl>WOv!$ZkNbW zC7*H9lC$+PF5FBSeHw26R9kF3@j<#!*vWBQ(Hd;QRXi!5lIiFdfq;CTPP<%ck4?KL z0m*w8{uow&`fQA@UznL@!%^L-wxKdN=6-j}{RJlm<`A`pxlrl!eRbm{F%67WHz`g3 z%GG6pM7DZ%a`D&hztdvAMjj5d(HwYF=o}(mQ%cBxYKznC95n-3f0^-2{2 + */ +#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, + "Configuration - Colors" +}; + +EAPI void * +e_modapi_init(E_Module *m) +{ + e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance"); + e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL, "enlightenment/colors", e_int_config_color_classes); + conf_module = m; + return m; +} + +EAPI int +e_modapi_shutdown(E_Module *m) +{ + e_configure_registry_item_del("appearance/colors"); + e_configure_registry_category_del("appearance"); + conf_module = NULL; + return 1; +} + +EAPI int +e_modapi_save(E_Module *m) +{ + return 1; +} + +EAPI int +e_modapi_about(E_Module *m) +{ + e_module_dialog_show(m, + _("Enlightenment Configuration Module - Colors"), + _("Configuration dialog for colors.")); + return 1; +} diff --git a/src/modules/conf_colors/e_mod_main.h b/src/modules/conf_colors/e_mod_main.h new file mode 100644 index 000000000..ba02abb27 --- /dev/null +++ b/src/modules/conf_colors/e_mod_main.h @@ -0,0 +1,19 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ +#ifndef E_MOD_MAIN_H +#define E_MOD_MAIN_H + +#define E_TYPEDEFS 1 +#include "e_int_config_color_classes.h" +#undef E_TYPEDEFS +#include "e_int_config_color_classes.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); +EAPI int e_modapi_about (E_Module *m); + +#endif diff --git a/src/modules/conf_colors/module.desktop.in b/src/modules/conf_colors/module.desktop.in new file mode 100644 index 000000000..8b15ed4bb --- /dev/null +++ b/src/modules/conf_colors/module.desktop.in @@ -0,0 +1,4 @@ +[Desktop Entry] +Type=Link +Name=Configuration - Colors +Icon=e-module-conf_colors diff --git a/src/modules/conf_fonts/.cvsignore b/src/modules/conf_fonts/.cvsignore new file mode 100644 index 000000000..06d064a84 --- /dev/null +++ b/src/modules/conf_fonts/.cvsignore @@ -0,0 +1,7 @@ +.deps +.libs +Makefile +Makefile.in +*.lo +module.la +module.desktop diff --git a/src/modules/conf_fonts/Makefile.am b/src/modules/conf_fonts/Makefile.am new file mode 100644 index 000000000..db0031de0 --- /dev/null +++ b/src/modules/conf_fonts/Makefile.am @@ -0,0 +1,31 @@ +MAINTAINERCLEANFILES = Makefile.in +MODULE = conf_fonts + +# 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_srcdir)/src/lib \ + -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_fonts.c \ + e_int_config_fonts.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_fonts/e-module-conf_fonts.edj b/src/modules/conf_fonts/e-module-conf_fonts.edj new file mode 100644 index 0000000000000000000000000000000000000000..a59e24c6146505f8689ae61e1dbed188d8aa49b8 GIT binary patch literal 3634 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 + */ +#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, + "Configuration - Colors" +}; + +EAPI void * +e_modapi_init(E_Module *m) +{ + e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance"); + e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL, "enlightenment/fonts", e_int_config_fonts); + conf_module = m; + return m; +} + +EAPI int +e_modapi_shutdown(E_Module *m) +{ + e_configure_registry_item_del("appearance/fonts"); + e_configure_registry_category_del("appearance"); + conf_module = NULL; + return 1; +} + +EAPI int +e_modapi_save(E_Module *m) +{ + return 1; +} + +EAPI int +e_modapi_about(E_Module *m) +{ + e_module_dialog_show(m, + _("Enlightenment Configuration Module - Fonts"), + _("Configuration dialog for fonts.")); + return 1; +} diff --git a/src/modules/conf_fonts/e_mod_main.h b/src/modules/conf_fonts/e_mod_main.h new file mode 100644 index 000000000..4d2bf1049 --- /dev/null +++ b/src/modules/conf_fonts/e_mod_main.h @@ -0,0 +1,19 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ +#ifndef E_MOD_MAIN_H +#define E_MOD_MAIN_H + +#define E_TYPEDEFS 1 +#include "e_int_config_fonts.h" +#undef E_TYPEDEFS +#include "e_int_config_fonts.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); +EAPI int e_modapi_about (E_Module *m); + +#endif diff --git a/src/modules/conf_fonts/module.desktop.in b/src/modules/conf_fonts/module.desktop.in new file mode 100644 index 000000000..aeb15ce32 --- /dev/null +++ b/src/modules/conf_fonts/module.desktop.in @@ -0,0 +1,4 @@ +[Desktop Entry] +Type=Link +Name=Configuration - Fonts +Icon=e-module-conf_fonts diff --git a/src/modules/conf_theme/.cvsignore b/src/modules/conf_theme/.cvsignore new file mode 100644 index 000000000..06d064a84 --- /dev/null +++ b/src/modules/conf_theme/.cvsignore @@ -0,0 +1,7 @@ +.deps +.libs +Makefile +Makefile.in +*.lo +module.la +module.desktop diff --git a/src/modules/conf_theme/Makefile.am b/src/modules/conf_theme/Makefile.am new file mode 100644 index 000000000..ac5faff7b --- /dev/null +++ b/src/modules/conf_theme/Makefile.am @@ -0,0 +1,33 @@ +MAINTAINERCLEANFILES = Makefile.in +MODULE = conf_theme + +# 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_srcdir)/src/lib \ + -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_theme.c \ + e_int_config_theme.h \ + e_int_config_theme_import.c \ + e_int_config_theme_import.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_theme/e-module-conf_theme.edj b/src/modules/conf_theme/e-module-conf_theme.edj new file mode 100644 index 0000000000000000000000000000000000000000..a59e24c6146505f8689ae61e1dbed188d8aa49b8 GIT binary patch literal 3634 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 + */ +#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, + "Configuration - Theme" +}; + +EAPI void * +e_modapi_init(E_Module *m) +{ + e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance"); + e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL, "enlightenment/themes", e_int_config_theme); + conf_module = m; + return m; +} + +EAPI int +e_modapi_shutdown(E_Module *m) +{ + e_configure_registry_item_del("appearance/theme"); + e_configure_registry_category_del("appearance"); + conf_module = NULL; + return 1; +} + +EAPI int +e_modapi_save(E_Module *m) +{ + return 1; +} + +EAPI int +e_modapi_about(E_Module *m) +{ + e_module_dialog_show(m, + _("Enlightenment Configuration Module - Theme"), + _("Configuration dialog for theme.")); + return 1; +} diff --git a/src/modules/conf_theme/e_mod_main.h b/src/modules/conf_theme/e_mod_main.h new file mode 100644 index 000000000..412357a40 --- /dev/null +++ b/src/modules/conf_theme/e_mod_main.h @@ -0,0 +1,21 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ +#ifndef E_MOD_MAIN_H +#define E_MOD_MAIN_H + +#define E_TYPEDEFS 1 +#include "e_int_config_theme.h" +#include "e_int_config_theme_import.h" +#undef E_TYPEDEFS +#include "e_int_config_theme.h" +#include "e_int_config_theme_import.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); +EAPI int e_modapi_about (E_Module *m); + +#endif diff --git a/src/modules/conf_theme/module.desktop.in b/src/modules/conf_theme/module.desktop.in new file mode 100644 index 000000000..061a5fe36 --- /dev/null +++ b/src/modules/conf_theme/module.desktop.in @@ -0,0 +1,4 @@ +[Desktop Entry] +Type=Link +Name=Configuration - Theme +Icon=e-module-conf_theme diff --git a/src/modules/conf_wallpaper/e_mod_main.c b/src/modules/conf_wallpaper/e_mod_main.c index 52122dc27..ec4bb9cd0 100644 --- a/src/modules/conf_wallpaper/e_mod_main.c +++ b/src/modules/conf_wallpaper/e_mod_main.c @@ -25,7 +25,7 @@ static E_Module *conf_module = NULL; EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, - "Configuration - Layout" + "Configuration - Wallpaper" }; EAPI void *