forked from enlightenment/enlightenment
first module makes its way into a module of its own.
this 1. allows different config dialogs to do the same thing - eg replace it with a different ui or idea. 2. allows people to switch off cofngi they dont need or want and even not ship the ui to configure it 3. is a nice proof of concept that modules cna do more than just be the things at the bottom of your screen in a "panel". SVN revision: 30590
This commit is contained in:
parent
371504515f
commit
31ded828f1
|
@ -250,6 +250,8 @@ src/modules/start/Makefile
|
||||||
src/modules/start/module.desktop
|
src/modules/start/module.desktop
|
||||||
src/modules/layout/Makefile
|
src/modules/layout/Makefile
|
||||||
src/modules/layout/module.desktop
|
src/modules/layout/module.desktop
|
||||||
|
src/modules/conf_wallpaper/Makefile
|
||||||
|
src/modules/conf_wallpaper/module.desktop
|
||||||
src/preload/Makefile
|
src/preload/Makefile
|
||||||
data/Makefile
|
data/Makefile
|
||||||
data/fonts/Makefile
|
data/fonts/Makefile
|
||||||
|
|
|
@ -170,9 +170,6 @@ e_widget_spectrum.h \
|
||||||
e_widget_cslider.h \
|
e_widget_cslider.h \
|
||||||
e_widget_csel.h \
|
e_widget_csel.h \
|
||||||
e_widget_color_well.h \
|
e_widget_color_well.h \
|
||||||
e_int_config_wallpaper.h \
|
|
||||||
e_int_config_wallpaper_import.h \
|
|
||||||
e_int_config_wallpaper_gradient.h \
|
|
||||||
e_color_dialog.h \
|
e_color_dialog.h \
|
||||||
e_sys.h \
|
e_sys.h \
|
||||||
e_obj_dialog.h \
|
e_obj_dialog.h \
|
||||||
|
@ -336,9 +333,6 @@ e_widget_spectrum.c \
|
||||||
e_widget_cslider.c \
|
e_widget_cslider.c \
|
||||||
e_widget_csel.c \
|
e_widget_csel.c \
|
||||||
e_widget_color_well.c \
|
e_widget_color_well.c \
|
||||||
e_int_config_wallpaper.c \
|
|
||||||
e_int_config_wallpaper_import.c \
|
|
||||||
e_int_config_wallpaper_gradient.c \
|
|
||||||
e_color_dialog.c \
|
e_color_dialog.c \
|
||||||
e_sys.c \
|
e_sys.c \
|
||||||
e_int_config_transitions.c \
|
e_int_config_transitions.c \
|
||||||
|
|
|
@ -754,6 +754,7 @@ e_config_init(void)
|
||||||
CFG_MODULE("cpufreq", 1);
|
CFG_MODULE("cpufreq", 1);
|
||||||
CFG_MODULE("temperature", 1);
|
CFG_MODULE("temperature", 1);
|
||||||
CFG_MODULE("pager", 1);
|
CFG_MODULE("pager", 1);
|
||||||
|
CFG_MODULE("conf_wallpaper", 1);
|
||||||
}
|
}
|
||||||
#if 0
|
#if 0
|
||||||
{
|
{
|
||||||
|
|
|
@ -422,7 +422,7 @@ e_configure_init(void)
|
||||||
{
|
{
|
||||||
/* FIXME: hardcoded - need to move these into modules - except modules config */
|
/* 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_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/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/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/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/fonts", 40, _("Fonts"), NULL, "enlightenment/fonts", e_int_config_fonts);
|
||||||
|
@ -486,7 +486,7 @@ e_configure_init(void)
|
||||||
*/
|
*/
|
||||||
e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
|
e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
|
||||||
e_configure_registry_item_add("internal/borders_border", -1, _("Border"), NULL, "enlightenment/windows", e_int_config_borders_border);
|
e_configure_registry_item_add("internal/borders_border", -1, _("Border"), NULL, "enlightenment/windows", e_int_config_borders_border);
|
||||||
e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"), NULL, "enlightenment/windows", e_int_config_wallpaper_desk);
|
// e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"), NULL, "enlightenment/windows", e_int_config_wallpaper_desk);
|
||||||
e_configure_registry_item_add("internal/desk", -1, _("Desk"), NULL, "enlightenment/windows", e_int_config_desk);
|
e_configure_registry_item_add("internal/desk", -1, _("Desk"), NULL, "enlightenment/windows", e_int_config_desk);
|
||||||
e_configure_registry_item_add("internal/ibar_other", -1, _("IBar Other"), NULL, "enlightenment/windows", e_int_config_apps_ibar_other);
|
e_configure_registry_item_add("internal/ibar_other", -1, _("IBar Other"), NULL, "enlightenment/windows", e_int_config_apps_ibar_other);
|
||||||
}
|
}
|
||||||
|
|
|
@ -139,9 +139,6 @@
|
||||||
#include "e_widget_framelist.h"
|
#include "e_widget_framelist.h"
|
||||||
#include "e_widget_fsel.h"
|
#include "e_widget_fsel.h"
|
||||||
#include "e_fm_mime.h"
|
#include "e_fm_mime.h"
|
||||||
#include "e_int_config_wallpaper.h"
|
|
||||||
#include "e_int_config_wallpaper_import.h"
|
|
||||||
#include "e_int_config_wallpaper_gradient.h"
|
|
||||||
#include "e_color.h"
|
#include "e_color.h"
|
||||||
#include "e_spectrum.h"
|
#include "e_spectrum.h"
|
||||||
#include "e_widget_spectrum.h"
|
#include "e_widget_spectrum.h"
|
||||||
|
|
|
@ -9,4 +9,5 @@ temperature \
|
||||||
cpufreq \
|
cpufreq \
|
||||||
ibox \
|
ibox \
|
||||||
start \
|
start \
|
||||||
layout
|
layout \
|
||||||
|
conf_wallpaper
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
.deps
|
||||||
|
.libs
|
||||||
|
Makefile
|
||||||
|
Makefile.in
|
||||||
|
*.lo
|
||||||
|
module.la
|
||||||
|
module.desktop
|
|
@ -0,0 +1,35 @@
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
MODULE = conf_wallpaper
|
||||||
|
|
||||||
|
# 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_wallpaper.c \
|
||||||
|
e_int_config_wallpaper_gradient.c \
|
||||||
|
e_int_config_wallpaper_gradient.h \
|
||||||
|
e_int_config_wallpaper.h \
|
||||||
|
e_int_config_wallpaper_import.c \
|
||||||
|
e_int_config_wallpaper_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)
|
Binary file not shown.
|
@ -1,8 +1,8 @@
|
||||||
/*
|
/*
|
||||||
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
|
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "e.h"
|
#include "e.h"
|
||||||
|
#include "e_mod_main.h"
|
||||||
|
|
||||||
static void *_create_data (E_Config_Dialog *cfd);
|
static void *_create_data (E_Config_Dialog *cfd);
|
||||||
static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
|
@ -2,6 +2,7 @@
|
||||||
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
|
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
|
||||||
*/
|
*/
|
||||||
#include "e.h"
|
#include "e.h"
|
||||||
|
#include "e_mod_main.h"
|
||||||
|
|
||||||
#define GRAD_H 0
|
#define GRAD_H 0
|
||||||
#define GRAD_V 1
|
#define GRAD_V 1
|
|
@ -1,4 +1,8 @@
|
||||||
|
/*
|
||||||
|
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
|
||||||
|
*/
|
||||||
#include "e.h"
|
#include "e.h"
|
||||||
|
#include "e_mod_main.h"
|
||||||
|
|
||||||
#define IMPORT_STRETCH 0
|
#define IMPORT_STRETCH 0
|
||||||
#define IMPORT_TILE 1
|
#define IMPORT_TILE 1
|
|
@ -0,0 +1,66 @@
|
||||||
|
/*
|
||||||
|
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-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 - Layout"
|
||||||
|
};
|
||||||
|
|
||||||
|
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/wallpaper", 10, _("Wallpaper"), NULL, "enlightenment/background", e_int_config_wallpaper);
|
||||||
|
e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
|
||||||
|
e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"), NULL, "enlightenment/windows", e_int_config_wallpaper_desk);
|
||||||
|
conf_module = m;
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
EAPI int
|
||||||
|
e_modapi_shutdown(E_Module *m)
|
||||||
|
{
|
||||||
|
e_configure_registry_item_del("internal/wallpaper_desk");
|
||||||
|
e_configure_registry_category_del("internal");
|
||||||
|
e_configure_registry_item_del("appearance/wallpaper");
|
||||||
|
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 - Wallpaper"),
|
||||||
|
_("Configuration dialog for wallpaper configuration."));
|
||||||
|
return 1;
|
||||||
|
}
|
|
@ -0,0 +1,23 @@
|
||||||
|
/*
|
||||||
|
* 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_wallpaper.h"
|
||||||
|
#include "e_int_config_wallpaper_import.h"
|
||||||
|
#include "e_int_config_wallpaper_gradient.h"
|
||||||
|
#undef E_TYPEDEFS
|
||||||
|
#include "e_int_config_wallpaper.h"
|
||||||
|
#include "e_int_config_wallpaper_import.h"
|
||||||
|
#include "e_int_config_wallpaper_gradient.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
|
|
@ -0,0 +1,4 @@
|
||||||
|
[Desktop Entry]
|
||||||
|
Type=Link
|
||||||
|
Name=Configuration - Wallpaper
|
||||||
|
Icon=e-module-conf_wallpaper
|
|
@ -0,0 +1,7 @@
|
||||||
|
.deps
|
||||||
|
.libs
|
||||||
|
Makefile
|
||||||
|
Makefile.in
|
||||||
|
*.lo
|
||||||
|
module.la
|
||||||
|
module.desktop
|
Loading…
Reference in New Issue