conf2 and related subsystems were a fun and useful experiment, but this is not their time. removed.

see econf.git
devs/sachiel/e19
Mike Blumenkrantz 9 years ago
parent e31472e8c3
commit abff6f1427
  1. 2
      configure.ac
  2. 2
      src/bin/Makefile.am
  3. 283
      src/bin/e_comp.c
  4. 2857
      src/bin/e_configure_option.c
  5. 176
      src/bin/e_configure_option.h
  6. 1
      src/bin/e_includes.h
  7. 8
      src/bin/e_main.c
  8. 4
      src/modules/Makefile.am
  9. 46
      src/modules/Makefile_conf2.am
  10. 1
      src/modules/conf2/.gitignore
  11. 2208
      src/modules/conf2/e-module-conf2.edc
  12. 1319
      src/modules/conf2/e_conf2.c
  13. 381
      src/modules/conf2/e_mod_main.c
  14. 28
      src/modules/conf2/e_mod_main.h
  15. BIN
      src/modules/conf2/images/bevel_curved_horiz_out.png
  16. BIN
      src/modules/conf2/images/bevel_horiz_out.png
  17. BIN
      src/modules/conf2/images/bevel_in.png
  18. BIN
      src/modules/conf2/images/button_clicked.png
  19. BIN
      src/modules/conf2/images/button_normal.png
  20. BIN
      src/modules/conf2/images/inset_circle_tiny.png
  21. BIN
      src/modules/conf2/images/inset_shadow_circle_tiny.png
  22. BIN
      src/modules/conf2/images/inset_shadow_tiny.png
  23. BIN
      src/modules/conf2/images/shadow_rounded_horiz.png
  24. BIN
      src/modules/conf2/images/shine.png
  25. BIN
      src/modules/conf2/images/sym_check_alum.png
  26. BIN
      src/modules/conf2/images/sym_radio_alum.png
  27. BIN
      src/modules/conf2/images/vgrad_med_curved.png
  28. BIN
      src/modules/conf2/images/vgrad_med_dark.png
  29. BIN
      src/modules/conf2/images/volume_knob.png
  30. BIN
      src/modules/conf2/images/volume_knob_ledsoff.png
  31. BIN
      src/modules/conf2/images/volume_knob_move.png
  32. BIN
      src/modules/conf2/images/volume_led_01.png
  33. BIN
      src/modules/conf2/images/white_bar_vert_glow.png
  34. 17
      src/modules/conf2/module.desktop.in
  35. 35
      src/modules/conf_applications/e_mod_main.c
  36. 26
      src/modules/conf_bindings/e_mod_main.c
  37. 9
      src/modules/conf_comp/e_mod_main.c
  38. 10
      src/modules/conf_dialogs/e_mod_main.c
  39. 18
      src/modules/conf_intl/e_mod_main.c
  40. 14
      src/modules/conf_paths/e_mod_main.c
  41. 12
      src/modules/conf_randr/e_mod_main.c
  42. 12
      src/modules/conf_shelves/e_mod_main.c
  43. 7
      src/modules/conf_theme/e_int_config_theme.c
  44. 141
      src/modules/conf_theme/e_int_config_xsettings.c
  45. 99
      src/modules/conf_theme/e_mod_main.c
  46. 11
      src/modules/conf_window_remembers/e_mod_main.c
  47. 12
      src/modules/everything/e_mod_main.c
  48. 126
      src/modules/fileman/e_mod_main.c
  49. 68
      src/modules/notification/e_mod_main.c
  50. 24
      src/modules/quickaccess/e_mod_main.c
  51. 34
      src/modules/teamwork/e_mod_main.c
  52. 29
      src/modules/tiling/e_mod_tiling.c
  53. 12
      src/modules/xkbswitch/e_mod_main.c

@ -857,7 +857,6 @@ AC_E_OPTIONAL_MODULE([fileman], true)
AC_E_OPTIONAL_MODULE([fileman_opinfo], true)
AC_E_OPTIONAL_MODULE([wizard], true)
AC_E_OPTIONAL_MODULE([conf], true)
AC_E_OPTIONAL_MODULE([conf2], true)
AC_E_OPTIONAL_MODULE([conf_comp], true)
AC_E_OPTIONAL_MODULE([conf_wallpaper2], true)
AC_E_OPTIONAL_MODULE([conf_theme], true, true)
@ -971,7 +970,6 @@ src/modules/winlist/module.desktop
src/modules/fileman/module.desktop
src/modules/fileman_opinfo/module.desktop
src/modules/conf/module.desktop
src/modules/conf2/module.desktop
src/modules/conf_wallpaper2/module.desktop
src/modules/conf_theme/module.desktop
src/modules/conf_intl/module.desktop

@ -62,7 +62,6 @@ e_config_data.h \
e_config_dialog.h \
e_config.h \
e_configure.h \
e_configure_option.h \
e_confirm_dialog.h \
e_container.h \
e_datastore.h \
@ -233,7 +232,6 @@ e_config.c \
e_config_data.c \
e_config_dialog.c \
e_configure.c \
e_configure_option.c \
e_confirm_dialog.c \
e_container.c \
e_datastore.c \

@ -4607,284 +4607,6 @@ _e_comp_sys_resume(void)
_e_comp_sys_emit_cb_wait(E_SYS_SUSPEND, "e,state,sys,resume", NULL, EINA_FALSE);
}
static Eina_List *
_e_comp_config_engine_info_cb(E_Configure_Option *co)
{
Eina_List *ret = NULL;
E_Configure_Option_Info *oi;
int x;
const char *name[] =
{
"Software", NULL
};
if (gl_avail) name[1] = "OpenGL";
for (x = E_COMP_ENGINE_SW; x <= E_COMP_ENGINE_SW + gl_avail; x++)
{
oi = e_configure_option_info_new(co, _(name[x - 1]), (intptr_t *)(long)x);
oi->current = (*(int *)co->valptr == x);
ret = eina_list_append(ret, oi);
}
return ret;
}
static Eina_Bool
_e_comp_config_style_thumb_timer_cb(void *data)
{
Evas_Object *oo, *ofr = data;
int demo_state;
demo_state = (long)(intptr_t)evas_object_data_get(data, "style_demo_state");
demo_state = (demo_state + 1) % 4;
evas_object_data_set(data, "style_demo_state", (intptr_t *)(long)demo_state);
oo = evas_object_data_get(ofr, "comp_preview");
switch (demo_state)
{
case 0:
edje_object_signal_emit(oo, "e,state,visible,on", "e");
edje_object_signal_emit(oo, "e,state,focus,on", "e");
edje_object_part_text_set(ofr, "e.text.label", _("Visible"));
break;
case 1:
edje_object_signal_emit(oo, "e,state,focus,off", "e");
edje_object_part_text_set(ofr, "e.text.label", _("Focus-Out"));
break;
case 2:
edje_object_signal_emit(oo, "e,state,focus,on", "e");
edje_object_part_text_set(ofr, "e.text.label", _("Focus-In"));
break;
case 3:
edje_object_signal_emit(oo, "e,state,visible,off", "e");
edje_object_part_text_set(ofr, "e.text.label", _("Hidden"));
break;
default:
break;
}
return ECORE_CALLBACK_RENEW;
}
static void
_e_comp_config_style_thumb_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{
evas_object_del(edje_object_part_swallow_get(obj, "e.swallow.preview"));
ecore_timer_del(data);
}
static Evas_Object *
_e_comp_config_style_thumb_cb(E_Configure_Option_Info *oi, Evas *evas)
{
Evas_Object *ob, *oly, *oo, *obd, *ofr, *orec;
Ecore_Timer *timer;
char buf[4096];
ob = e_livethumb_add(evas);
e_livethumb_vsize_set(ob, 240, 240);
oly = e_layout_add(e_livethumb_evas_get(ob));
e_layout_virtual_size_set(oly, 240, 240);
e_livethumb_thumb_set(ob, oly);
evas_object_show(oly);
oo = edje_object_add(e_livethumb_evas_get(ob));
snprintf(buf, sizeof(buf), "e/comp/border/%s", oi->name);
e_theme_edje_object_set(oo, "base/theme/borders", buf);
e_layout_pack(oly, oo);
e_layout_child_move(oo, 39, 39);
e_layout_child_resize(oo, 162, 162);
edje_object_signal_emit(oo, "e,state,shadow,on", "e");
edje_object_signal_emit(oo, "e,state,visible,on", "e");
evas_object_show(oo);
ofr = edje_object_add(evas);
e_theme_edje_object_set
(ofr, "base/theme/comp", "e/comp/preview");
edje_object_part_swallow(ofr, "e.swallow.preview", ob);
evas_object_show(ofr);
obd = edje_object_add(e_livethumb_evas_get(ob));
e_theme_edje_object_set(obd, "base/theme/borders", "e/widgets/border/default/border");
edje_object_part_text_set(obd, "e.text.title", _("Title"));
edje_object_signal_emit(obd, "e,state,focused", "e");
edje_object_part_swallow(oo, "e.swallow.content", obd);
evas_object_show(obd);
orec = evas_object_rectangle_add(e_livethumb_evas_get(ob));
evas_object_color_set(orec, 0, 0, 0, 128);
edje_object_part_swallow(obd, "e.swallow.client", orec);
evas_object_show(orec);
timer = ecore_timer_add(3.0, _e_comp_config_style_thumb_timer_cb, ofr);
evas_object_data_set(ofr, "style_demo_state", (void *)1);
evas_object_data_set(ofr, "comp_timer", timer);
evas_object_data_set(ofr, "comp_preview", oo);
evas_object_event_callback_add(ofr, EVAS_CALLBACK_DEL, _e_comp_config_style_thumb_del_cb, timer);
return ofr;
}
static Eina_List *
_e_comp_config_style_info_cb(E_Configure_Option *co)
{
Eina_List *ret = NULL, *styles;
Eina_Stringshare *style;
E_Configure_Option_Info *oi;
styles = e_theme_comp_border_list();
EINA_LIST_FREE(styles, style)
{
oi = e_configure_option_info_new(co, style, style);
oi->current = (conf->shadow_style == style);
ret = eina_list_append(ret, oi);
}
return ret;
}
static Eina_List *
_e_comp_fps_corner_info_cb(E_Configure_Option *co)
{
Eina_List *ret = NULL;
E_Configure_Option_Info *oi;
int x;
const char *name[] =
{
"Top left", "Top right", "Bottom left", "Bottom right", };
for (x = 0; x <= 3; x++)
{
oi = e_configure_option_info_new(co, _(name[x]), (intptr_t *)(long)x);
oi->current = (*(int *)co->valptr == x);
ret = eina_list_append(ret, oi);
}
return ret;
}
#ifdef ECORE_EVAS_GL_X11_OPT_SWAP_MODE
static Eina_List *
_e_comp_swap_mode_info_cb(E_Configure_Option *co)
{
Eina_List *ret = NULL;
E_Configure_Option_Info *oi;
int x;
const char *name[] =
{
"Auto", "Invalidate (full redraw)", "Copy from back to front", "Double-buffered", "Triple-buffered"
};
for (x = ECORE_EVAS_GL_X11_SWAP_MODE_AUTO; x <= ECORE_EVAS_GL_X11_SWAP_MODE_TRIPLE; x++)
{
oi = e_configure_option_info_new(co, _(name[x]), (intptr_t *)(long)x);
oi->current = (*(int *)co->valptr == x);
ret = eina_list_append(ret, oi);
}
return ret;
}
#endif
static void
_e_comp_cfg_init(void)
{
E_Configure_Option *co;
e_configure_option_domain_current_set("e_comp");
E_CONFIGURE_OPTION_ADD(co, BOOL, fast_borders, conf, _("Use fast composite effects for windows"), _("composite"), _("border"), _("theme"), _("animate"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, BOOL, fast_menus, conf, _("Use fast composite effects for menus"), _("composite"), _("menu"), _("theme"), _("animate"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, BOOL, fast_popups, conf, _("Use fast composite effects for popups"), _("composite"), _("popup"), _("theme"), _("animate"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, BOOL, fast_objects, conf, _("Use fast composite effects for objects"), _("composite"), _("theme"), _("animate"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, BOOL, fast_overrides, conf, _("Use fast composite effects for override-redirect windows (tooltips and such)"), _("composite"), _("theme"), _("animate"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, BOOL, match.disable_borders, conf, _("Disable composite effects for windows"), _("composite"), _("border"), _("theme"), _("animate"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, BOOL, match.disable_menus, conf, _("Disable composite effects for menus"), _("composite"), _("menu"), _("theme"), _("animate"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, BOOL, match.disable_popups, conf, _("Disable composite effects for popups"), _("composite"), _("popup"), _("theme"), _("animate"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, BOOL, match.disable_objects, conf, _("Disable composite effects for objects"), _("composite"), _("theme"), _("animate"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, BOOL, match.disable_overrides, conf, _("Disable composite effects for override-redirect windows (tooltips and such)"), _("composite"), _("theme"), _("animate"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, BOOL, disable_screen_effects, conf, _("Disable composite effects for the screen"), _("composite"), _("theme"), _("animate"), _("screen"));
E_CONFIGURE_OPTION_HELP(co, _("This option disables composite effects from themes, such as animating the screen fade when blanking"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, ENUM, engine, conf, _("Compositing engine"), _("composite"), _("border"));
E_CONFIGURE_OPTION_ICON(co, "preferences-engine");
co->info_cb = _e_comp_config_engine_info_cb;
co->requires_restart = 1;
E_CONFIGURE_OPTION_ADD(co, STR, shadow_style, conf, _("Default window composite effect"), _("composite"), _("border"), _("theme"));
co->info_cb = _e_comp_config_style_info_cb;
co->thumb_cb = _e_comp_config_style_thumb_cb;
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, BOOL, smooth_windows, conf, _("Smooth scaling of composited window content"), _("composite"), _("border"));
/* FIXME: help text */
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, BOOL, efl_sync, conf, _("Sync composited windows"), _("composite"), _("border"));
/* FIXME: help text */
co->requires_restart = 1;
E_CONFIGURE_OPTION_ADD(co, BOOL, loose_sync, conf, _("Loose sync composited windows"), _("composite"), _("border"));
/* FIXME: help text */
co->requires_restart = 1;
E_CONFIGURE_OPTION_ADD(co, BOOL, grab, conf, _("Grab server during rendering of composited windows"), _("composite"), _("border"));
/* FIXME: help text */
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, DOUBLE, first_draw_delay, conf, _("Initial draw timeout for newly-mapped composited windows"), _("composite"), _("border"), _("delay"));
E_CONFIGURE_OPTION_MINMAX_STEP_FMT(co, 0.01, 0.5, 0.01, _("%1.2f seconds"));
/* FIXME: help text */
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
if (gl_avail)
{
E_CONFIGURE_OPTION_ADD(co, BOOL, vsync, conf, _("Tear-free compositing (VSYNC)"), _("composite"), _("border"));
co->requires_restart = 1;
E_CONFIGURE_OPTION_ADD(co, BOOL, texture_from_pixmap, conf, _("Texture from pixmap rendering for composite"), _("composite"), _("border"));
co->requires_restart = 1;
#ifdef ECORE_EVAS_GL_X11_OPT_SWAP_MODE
if ((evas_version->major >= 1) &&
(evas_version->minor >= 7) &&
(evas_version->micro >= 99))
{
E_CONFIGURE_OPTION_ADD(co, ENUM, swap_mode, conf, _("Composite swapping method"), _("composite"), _("border"));
co->info_cb = _e_comp_swap_mode_info_cb;
co->requires_restart = 1;
}
#endif
}
E_CONFIGURE_OPTION_ADD(co, BOOL, nocomp_fs, conf, _("Don't composite fullscreen windows"), _("composite"), _("border"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, BOOL, nofade, conf, _("Don't fade backlight"), _("composite"), _("backlight"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, BOOL, send_flush, conf, _("Send flush when compositing windows"), _("composite"), _("border"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, BOOL, send_dump, conf, _("Send dump when compositing windows"), _("composite"), _("border"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, BOOL, fps_show, conf, _("Show framerate when compositing windows"), _("composite"), _("border"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, DOUBLE_INT, fps_average_range, conf, _("Rolling average for fps display when compositing"), _("composite"), _("border"));
E_CONFIGURE_OPTION_MINMAX_STEP_FMT(co, 1, 120, 1, _("%1.0f frames"));
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
E_CONFIGURE_OPTION_ADD(co, ENUM, fps_corner, conf, _("Composite framerate display corner"), _("composite"), _("border"));
co->info_cb = _e_comp_fps_corner_info_cb;
co->funcs[1].none = co->funcs[0].none = e_comp_shadows_reset;
e_configure_option_category_tag_add(_("windows"), _("composite"));
e_configure_option_category_tag_add(_("composite"), _("composite"));
e_configure_option_category_icon_set(_("composite"), "preferences-composite");
}
static Eina_Bool
_e_comp_opacity_set_timer_cb(E_Comp_Win *cw)
{
@ -5072,7 +4794,6 @@ e_comp_init(void)
if (!e_comp_wl_init())
EINA_LOG_ERR("Failed to initialize Wayland Client Support !!");
#endif
_e_comp_cfg_init();
return EINA_TRUE;
}
@ -5108,10 +4829,6 @@ e_comp_shutdown(void)
e_comp_wl_shutdown();
#endif
e_configure_option_domain_clear("e_comp");
e_configure_option_category_tag_del(_("composite"), _("composite"));
e_configure_option_category_tag_del(_("windows"), _("composite"));
gl_avail = EINA_FALSE;
e_comp_cfdata_config_free(conf);
E_CONFIG_DD_FREE(conf_match_edd);

File diff suppressed because it is too large Load Diff

@ -1,176 +0,0 @@
#ifdef E_TYPEDEFS
typedef struct E_Event_Configure_Option E_Event_Configure_Option_Changed;
typedef struct E_Event_Configure_Option E_Event_Configure_Option_Add;
typedef struct E_Event_Configure_Option E_Event_Configure_Option_Del;
typedef struct E_Event_Configure_Category E_Event_Configure_Option_Category_Add;
typedef struct E_Event_Configure_Category E_Event_Configure_Option_Category_Del;
typedef struct E_Event_Configure_Tag E_Event_Configure_Option_Tag_Add;
typedef struct E_Event_Configure_Tag E_Event_Configure_Option_Tag_Del;
typedef struct E_Configure_Option_Info E_Configure_Option_Info;
typedef struct E_Configure_Option E_Configure_Option;
typedef struct E_Configure_Option_Ctx E_Configure_Option_Ctx;
typedef void (*E_Configure_Option_Set_Cb)();
typedef Eina_List *(*E_Configure_Option_Info_Cb)(E_Configure_Option *);
typedef Evas_Object *(*E_Configure_Option_Info_Thumb_Cb)(E_Configure_Option_Info *, Evas *);
#else
# ifndef E_CONFIGURE_OPTION_H
# define E_CONFIGURE_OPTION_H
#define E_CONFIGURE_OPTION_TAG_LENGTH 128
#define E_CONFIGURE_OPTION_ADD(OPT, TYPE, NAME, CFGPTR, DESC, ...) \
OPT = e_configure_option_add(E_CONFIGURE_OPTION_TYPE_##TYPE, DESC, #NAME, &CFGPTR->NAME, NULL);\
e_configure_option_tags_set(OPT, (const char*[]){__VA_ARGS__, NULL}, 0)
#define E_CONFIGURE_OPTION_ADD_CUSTOM(OPT, NAME, DESC, ...) \
OPT = e_configure_option_add(E_CONFIGURE_OPTION_TYPE_CUSTOM, DESC, NAME, NULL, NULL);\
e_configure_option_tags_set(OPT, (const char*[]){__VA_ARGS__, NULL}, 0)
#define E_CONFIGURE_OPTION_HELP(OPT, STR) \
OPT->help = eina_stringshare_add(STR)
#define E_CONFIGURE_OPTION_MINMAX_STEP_FMT(OPT, MIN, MAX, STEP, FMT) \
OPT->minmax[0] = (MIN), OPT->minmax[1] = (MAX), OPT->step = (STEP),\
OPT->info = eina_stringshare_add(FMT)
#define E_CONFIGURE_OPTION_ICON(OPT, ICON) \
e_configure_option_data_set(OPT, "icon", eina_stringshare_add(ICON))
EAPI extern int E_EVENT_CONFIGURE_OPTION_CHANGED;
EAPI extern int E_EVENT_CONFIGURE_OPTION_ADD;
EAPI extern int E_EVENT_CONFIGURE_OPTION_DEL;
EAPI extern int E_EVENT_CONFIGURE_OPTION_CATEGORY_ADD;
EAPI extern int E_EVENT_CONFIGURE_OPTION_CATEGORY_DEL;
EAPI extern int E_EVENT_CONFIGURE_OPTION_TAG_ADD;
EAPI extern int E_EVENT_CONFIGURE_OPTION_TAG_DEL;
typedef enum
{
E_CONFIGURE_OPTION_TYPE_BOOL,
E_CONFIGURE_OPTION_TYPE_INT,
E_CONFIGURE_OPTION_TYPE_UINT,
E_CONFIGURE_OPTION_TYPE_ENUM,
E_CONFIGURE_OPTION_TYPE_DOUBLE,
E_CONFIGURE_OPTION_TYPE_DOUBLE_UCHAR, //lround(double)
E_CONFIGURE_OPTION_TYPE_DOUBLE_INT, //lround(double)
E_CONFIGURE_OPTION_TYPE_DOUBLE_UINT, //lround(double)
E_CONFIGURE_OPTION_TYPE_STR,
E_CONFIGURE_OPTION_TYPE_CUSTOM,
} E_Configure_Option_Type;
struct E_Configure_Option
{
EINA_INLIST;
Eina_Value val;
E_Configure_Option_Type type;
void *valptr;
Eina_Hash *data;
double minmax[2]; //for sliders
double step; //for sliders
Eina_Stringshare *info; //for sliders, custom
E_Configure_Option_Info_Cb info_cb; //for enums
E_Configure_Option_Info_Thumb_Cb thumb_cb; //for custom thumbs
Eina_Stringshare *name;
Eina_Stringshare *desc;
Eina_Stringshare *help;
Eina_List *tags; //Eina_Stringshare
int event_type; //event to emit if changed
Eina_Stringshare *changed_action; //action to call if changed
struct
{
void (*none)(void);
void (*one)();
void (*two)();
} funcs[2]; //disable, enable
Eina_Bool requires_restart : 1;
Eina_Bool changed : 1;
};
struct E_Configure_Option_Info
{
E_Configure_Option *co;
Eina_Stringshare *name;
void *value;
Eina_Stringshare *thumb_file;
Eina_Stringshare *thumb_key;
Eina_Bool current : 1;
};
struct E_Event_Configure_Option
{
E_Configure_Option *co;
};
struct E_Event_Configure_Category
{
Eina_Stringshare *category;
};
struct E_Event_Configure_Tag
{
Eina_Stringshare *tag;
};
struct E_Configure_Option_Ctx
{
Eina_List *tags; // Eina_Stringshare
Eina_List *match_tags; // Eina_Stringshare
Eina_List *opts; // E_Configure_Option
Eina_Stringshare *category;
char *text;
Eina_Bool changed : 1;
};
EAPI const Eina_List *e_configure_option_tags_list(void);
EAPI const Eina_List *e_configure_option_changed_list(void);
EAPI void e_configure_option_apply_all(void);
EAPI void e_configure_option_reset_all(void);
EAPI E_Configure_Option *e_configure_option_add(E_Configure_Option_Type type, const char *desc, const char *name, void *valptr, const void *data);
EAPI void e_configure_option_tags_set(E_Configure_Option *co, const char * const *tags, unsigned int num_tags);
EAPI void e_configure_option_del(E_Configure_Option *eci);
EAPI const Eina_List *e_configure_option_tag_list_options(const char *tag);
EAPI void e_configure_option_changed(E_Configure_Option *co);
EAPI void e_configure_option_apply(E_Configure_Option *co);
EAPI void e_configure_option_reset(E_Configure_Option *co);
EAPI void *e_configure_option_data_set(E_Configure_Option *co, const char *key, const void *data);
EAPI void *e_configure_option_data_get(E_Configure_Option *co, const char *key);
EAPI const void *e_configure_option_value_get(E_Configure_Option *co);
EAPI E_Configure_Option_Info *e_configure_option_info_new(E_Configure_Option *co, const char *name, const void *value);
EAPI void e_configure_option_info_free(E_Configure_Option_Info *oi);
EAPI Eina_List *e_configure_option_info_get(E_Configure_Option *co);
EAPI Evas_Object *e_configure_option_info_thumb_get(E_Configure_Option_Info *oi, Evas *evas);
EAPI void e_configure_option_tag_alias_add(const char *tag, const char *alias);
EAPI void e_configure_option_tag_alias_del(const char *tag, const char *alias);
EAPI const Eina_List *e_configure_option_category_list(void);
EAPI const Eina_List *e_configure_option_category_list_tags(const char *cat);
EAPI void e_configure_option_category_tag_add(const char *cat, const char *tag);
EAPI void e_configure_option_category_tag_del(const char *cat, const char *tag);
EAPI Eina_Stringshare *e_configure_option_category_icon_get(const char *cat);
EAPI void e_configure_option_category_icon_set(const char *cat, const char *icon);
EAPI E_Configure_Option_Ctx *e_configure_option_ctx_new(void);
EAPI void e_configure_option_ctx_free(E_Configure_Option_Ctx *ctx);
EAPI Eina_Bool e_configure_option_ctx_update(E_Configure_Option_Ctx *ctx, const char *str);
EAPI const Eina_List *e_configure_option_ctx_option_list(E_Configure_Option_Ctx *ctx);
EAPI const Eina_List *e_configure_option_ctx_match_tag_list(E_Configure_Option_Ctx *ctx);
EAPI Eina_Bool e_configure_option_ctx_tag_add(E_Configure_Option_Ctx *ctx, Eina_Stringshare *tag);
EAPI Eina_Bool e_configure_option_ctx_tag_pop(E_Configure_Option_Ctx *ctx);
EAPI void e_configure_option_domain_current_set(const char *domain);
EAPI Eina_Inlist *e_configure_option_domain_list(const char *domain);
EAPI void e_configure_option_domain_clear(const char *domain);
EAPI const Eina_List *e_configure_option_util_themes_get(void);
EAPI const Eina_List *e_configure_option_util_themes_system_get(void);
EAPI const Eina_List *e_configure_option_util_themes_gtk_get(void);
EINTERN int e_configure_option_init(void);
EINTERN int e_configure_option_shutdown(void);
# endif
#endif

@ -58,7 +58,6 @@
#include "e_zoomap.h"
#include "e_dialog.h"
#include "e_configure.h"
#include "e_configure_option.h"
#include "e_about.h"
#include "e_theme_about.h"
#include "e_widget.h"

@ -609,10 +609,6 @@ main(int argc, char **argv)
TS("E_Intl Post Init Done");
_e_main_shutdown_push(e_intl_post_shutdown);
TS("E_Configure Option Init");
e_configure_option_init();
TS("E_Configure Option Init Done");
e_screensaver_preinit();
if (e_config->show_splash)
@ -656,8 +652,6 @@ main(int argc, char **argv)
e_init_show();
}
//configure_option_shutdown needs to be first
if (!really_know)
{
TS("Test File Format Support");
@ -1109,8 +1103,6 @@ _e_main_shutdown(int errcode)
if (_idle_flush) ecore_idle_enterer_del(_idle_flush);
_idle_flush = NULL;
e_configure_option_shutdown();
for (i = (_e_main_lvl - 1); i >= 0; i--)
(*_e_main_shutdown_func[i])();
if (errcode < 0) exit(errcode);

@ -91,10 +91,6 @@ if USE_MODULE_CONF
include Makefile_conf.am
endif
if USE_MODULE_CONF2
include Makefile_conf2.am
endif
if USE_MODULE_CONF_COMP
include Makefile_conf_comp.am
endif

@ -1,46 +0,0 @@
conf2dir = $(MDIR)/conf2
conf2_DATA = conf2/e-module-conf2.edj \
conf2/module.desktop
CLEANFILES += conf2/e-module-conf2.edj
EXTRA_DIST += $(conf2_DATA) \
conf2/e-module-conf2.edc \
conf2/module.desktop.in \
conf2/images/sym_check_alum.png \
conf2/images/bevel_curved_horiz_out.png \
conf2/images/sym_radio_alum.png \
conf2/images/volume_knob.png \
conf2/images/vgrad_med_dark.png \
conf2/images/bevel_in.png \
conf2/images/inset_shadow_tiny.png \
conf2/images/bevel_horiz_out.png \
conf2/images/white_bar_vert_glow.png \
conf2/images/vgrad_med_curved.png \
conf2/images/shine.png \
conf2/images/volume_knob_ledsoff.png \
conf2/images/inset_circle_tiny.png \
conf2/images/volume_knob_move.png \
conf2/images/shadow_rounded_horiz.png \
conf2/images/inset_shadow_circle_tiny.png \
conf2/images/volume_led_01.png \
conf2/images/button_normal.png \
conf2/images/button_clicked.png
conf2pkgdir = $(MDIR)/conf2/$(MODULE_ARCH)
conf2pkg_LTLIBRARIES = conf2/module.la
conf2_module_la_SOURCES = conf2/e_mod_main.c \
conf2/e_mod_main.h \
conf2/e_conf2.c
conf2_module_la_CFLAGS = $(AM_CFLAGS)
conf2_module_la_LIBADD =
CONF2_EDJE_FLAGS = $(EDJE_FLAGS) -id $(srcdir)/conf2/images -id $(top_srcdir)/data/themes/img
conf2/%.edj: $(srcdir)/conf2/%.edc Makefile
$(EDJE_CC) $(CONF2_EDJE_FLAGS) $< $@
.PHONY: conf2 install-conf2
conf2: $(conf2pkg_LTLIBRARIES) $(conf2_DATA)
install-conf2: install-conf2DATA install-conf2pkgLTLIBRARIES

@ -1 +0,0 @@
e-module-conf2.edj

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -1,381 +0,0 @@
#include "e.h"
#include "e_mod_main.h"
typedef struct _Instance Instance;
struct _Instance
{
E_Gadcon_Client *gcc;
Evas_Object *o_toggle;
};
/* actual module specifics */
//static void _e_mod_conf_cb(void *data, E_Menu *m, E_Menu_Item *mi);
//static void _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi);
//static void _config_pre_activate_cb(void *data, E_Menu *m);
/* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
static const char *_gc_label(const E_Gadcon_Client_Class *client_class);
static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class);
static void _cb_action_conf(void *data, Evas_Object *obj, const char *emission, const char *source);
static E_Module *conf_module = NULL;
static E_Action *act = NULL;
static E_Int_Menu_Augmentation *maug = NULL;
static Eina_List *instances = NULL;
EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Conf2" };
/* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class =
{
GADCON_CLIENT_CLASS_VERSION, "configuration",
{
_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL,
e_gadcon_site_is_not_toolbar
},
E_GADCON_CLIENT_STYLE_PLAIN
};
static E_Gadcon_Client *
_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
{
Instance *inst;
inst = E_NEW(Instance, 1);
inst->o_toggle = edje_object_add(gc->evas);
e_theme_edje_object_set(inst->o_toggle,
"base/theme/modules/conf2",
"e/modules/conf2/main");
inst->gcc = e_gadcon_client_new(gc, name, id, style, inst->o_toggle);
inst->gcc->data = inst;
edje_object_signal_callback_add(inst->o_toggle, "e,action,conf2", "",
_cb_action_conf, inst);
instances = eina_list_append(instances, inst);
e_gadcon_client_util_menu_attach(inst->gcc);
return inst->gcc;
}
static void
_gc_shutdown(E_Gadcon_Client *gcc)
{
Instance *inst;
if (!(inst = gcc->data)) return;
instances = eina_list_remove(instances, inst);
if (inst->o_toggle) evas_object_del(inst->o_toggle);
E_FREE(inst);
}
static void
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED)
{
Evas_Coord mw, mh;
edje_object_size_min_get(gcc->o_base, &mw, &mh);
if ((mw < 1) || (mh < 1))
edje_object_size_min_calc(gcc->o_base, &mw, &mh);
if (mw < 4) mw = 4;
if (mh < 4) mh = 4;
e_gadcon_client_aspect_set(gcc, mw, mh);
e_gadcon_client_min_size_set(gcc, mw, mh);
}
static const char *
_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED)
{
return _("Settings");
}
static Evas_Object *
_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas)
{
Evas_Object *o;
char buf[PATH_MAX];
o = edje_object_add(evas);
snprintf(buf, sizeof(buf), "%s/e-module-conf.edj",
e_module_dir_get(conf_module));
edje_object_file_set(o, buf, "icon");
return o;
}
static const char *
_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED)
{
return _gadcon_class.name;
}
/*
static void
_cb_button_click(void *data EINA_UNUSED, void *data2 EINA_UNUSED)
{
E_Action *a;
a = e_action_find("configuration");
if ((a) && (a->func.go)) a->func.go(NULL, NULL);
}
*/
static void
_cb_action_conf(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
{
Instance *inst;
E_Action *a;
if (!(inst = data)) return;
a = e_action_find("configuration");
if ((a) && (a->func.go)) a->func.go(NULL, NULL);
}
#if 0
static void
_e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi EINA_UNUSED)
{
Eina_List *l;
E_Configure_Cat *ecat;
EINA_LIST_FOREACH(e_configure_registry, l, ecat)
{
if ((ecat->pri >= 0) && (ecat->items))
{
E_Configure_It *eci;
Eina_List *ll;
EINA_LIST_FOREACH(ecat->items, ll, eci)
{
char buf[1024];
if ((eci->pri >= 0) && (eci == data))
{
snprintf(buf, sizeof(buf), "%s/%s", ecat->cat, eci->item);
e_configure_registry_call(buf, m->zone->container, NULL);
}
}
}
}
}
static void
_config_pre_activate_cb(void *data, E_Menu *m)
{
E_Configure_Cat *ecat = data;
E_Configure_It *eci;
Eina_List *l;
E_Menu_Item *mi;
e_menu_pre_activate_callback_set(m, NULL, NULL);
EINA_LIST_FOREACH(ecat->items, l, eci)
{
if (eci->pri >= 0)
{
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, eci->label);
if (eci->icon)
{
if (eci->icon_file)
e_menu_item_icon_edje_set(mi, eci->icon_file, eci->icon);
else
e_util_menu_item_theme_icon_set(mi, eci->icon);
}
e_menu_item_callback_set(mi, _e_mod_run_cb, eci);
}
}
}
static void
_config_item_activate_cb(void *data, E_Menu *m, E_Menu_Item *mi EINA_UNUSED)
{
E_Configure_Cat *ecat = data;
e_configure_show(m->zone->container, ecat->cat);
}
static void
_config_all_pre_activate_cb(void *data EINA_UNUSED, E_Menu *m)
{
const Eina_List *l;
E_Configure_Cat *ecat;
e_menu_pre_activate_callback_set(m, NULL, NULL);
EINA_LIST_FOREACH(e_configure_registry, l, ecat)
{
E_Menu_Item *mi;
E_Menu *sub;
if ((ecat->pri < 0) || (!ecat->items)) continue;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, ecat->label);
if (ecat->icon)
{
if (ecat->icon_file)
e_menu_item_icon_edje_set(mi, ecat->icon_file, ecat->icon);
else
e_util_menu_item_theme_icon_set(mi, ecat->icon);
}
e_menu_item_callback_set(mi, _config_item_activate_cb, ecat);
sub = e_menu_new();
e_menu_item_submenu_set(mi, sub);
e_object_unref(E_OBJECT(sub));
e_menu_pre_activate_callback_set(sub, _config_pre_activate_cb, ecat);
}
}
/* menu item add hook */
void
e_mod_config_menu_add(void *data EINA_UNUSED, E_Menu *m)
{
E_Menu_Item *mi;
E_Menu *sub;
e_menu_pre_activate_callback_set(m, NULL, NULL);
sub = e_menu_new();
e_menu_pre_activate_callback_set(sub, _config_all_pre_activate_cb, NULL);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("All"));
e_menu_item_submenu_set(mi, sub);
e_object_unref(E_OBJECT(sub));
}
#endif
static void
_e_mod_action_conf_cb(E_Object *obj, const char *params)
{
E_Zone *zone = NULL;
if (obj)
{
if (obj->type == E_MANAGER_TYPE)
zone = e_util_zone_current_get((E_Manager *)obj);
else if (obj->type == E_CONTAINER_TYPE)
zone = e_util_zone_current_get(((E_Container *)obj)->manager);
else if (obj->type == E_ZONE_TYPE)
zone = ((E_Zone *)obj);
else
zone = e_util_zone_current_get(e_manager_current_get());
}
if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
if ((zone) && (params))
e_configure_registry_call(params, zone->container, params);
else if (zone)
e_conf2_show(zone->container, params);
}
static void
_e_mod_menu_cb(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED)
{
e_conf2_show(NULL, NULL);
}
static void
_e_mod_menu_add(void *data EINA_UNUSED, E_Menu *m)
{
E_Menu_Item *mi;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Configuration"));
e_util_menu_item_theme_icon_set(mi, "preferences-system");
e_menu_item_callback_set(mi, _e_mod_menu_cb, NULL);
}
EAPI void *
e_modapi_init(E_Module *m)
{
char buf[PATH_MAX];
if (!e_win_elm_available()) return NULL;
if (e_action_find("configuration"))
{
e_util_dialog_show(_("Error"), _("conf2 module cannot be loaded when conf module is already loaded!"));
return NULL;
}
conf_module = m;
/* add module supplied action */
act = e_action_add("configuration");
if (act)
{
act->func.go = _e_mod_action_conf_cb;
e_action_predef_name_set(N_("Launch"), N_("Control Panel"),
"configuration", NULL, NULL, 0);
}
maug =
e_int_menus_menu_augmentation_add_sorted("config/0", _("Configuration"),
_e_mod_menu_add, NULL, NULL, NULL);
e_module_delayed_set(m, 1);
snprintf(buf, sizeof(buf), "%s/e-module-conf2.edj", e_module_dir_get(conf_module));
elm_theme_extension_add(NULL, buf);
//e_configure_registry_category_add("settings", 80, _("Settings"),
//NULL, "preferences-settings");
//e_configure_registry_item_add("settings/conf2", 110, _("Control Panel"),
//NULL, buf, e_int_config_conf2);
/*
if (conf->menu_augmentation)
{
conf->aug =
e_int_menus_menu_augmentation_add
("config/2", e_mod_config_menu_add, NULL, NULL, NULL);
}
*/
e_gadcon_provider_register(&_gadcon_class);
return m;
}
EAPI int
e_modapi_shutdown(E_Module *m EINA_UNUSED)
{
char buf[PATH_MAX];
e_conf2_hide();
snprintf(buf, sizeof(buf), "%s/e-module-conf2.edj", e_module_dir_get(conf_module));
elm_theme_extension_del(NULL, buf);
e_configure_registry_item_del("advanced/conf2");
e_configure_registry_category_del("advanced");
e_gadcon_provider_unregister(&_gadcon_class);
/* remove module-supplied menu additions */
if (maug)
{
e_int_menus_menu_augmentation_del("config/0", maug);
maug = NULL;
}
/*
if (conf->aug)
{
e_int_menus_menu_augmentation_del("config/2", conf->aug);
conf->aug = NULL;
}
*/
/* remove module-supplied action */
if (act)
{
e_action_predef_name_del("Launch", "Control Panel");
e_action_del("configuration");
act = NULL;
}
conf_module = NULL;
return 1;
}
EAPI int
e_modapi_save(E_Module *m EINA_UNUSED)
{
return 1;
}

@ -1,28 +0,0 @@
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
#define WEIGHT evas_object_size_hint_weight_set
#define ALIGN evas_object_size_hint_align_set
#define EXPAND(X) WEIGHT((X), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND)
#define FILL(X) ALIGN((X), EVAS_HINT_FILL, EVAS_HINT_FILL)
/**
* @addtogroup Optional_Conf
* @{
*
* @defgroup Module_Conf2 Improved Configuration Dialog
*
* Show the main configuration dialog used to access other
* configuration.
*
* @}
*/
typedef struct Config
{
} Config;
EINTERN void e_conf2_show(E_Container *con, const char *params);
EINTERN void e_conf2_hide(void);
#endif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 378 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 504 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 169 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 486 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 232 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 346 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 389 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 718 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 761 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 370 B

@ -1,17 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Type=Link
Name=Configuration
Name[ca]=Configuració
Name[eo]=Agordoj
Name[fr]=Configuration
Name[ru]=Настройки
Name[sr]=Подешавања
Comment=Improved Enlightenment configuration panel.
Comment[ca]=El nou panell de configuració millorat d'Enlightenment.
Comment[eo]=Plibonigata panelo de agordoj de Enlightenment
Comment[it]=Il nuovo pannello di configurazione potenziato di Enlightenment.
Comment[ru]=Улучшенная панель настройки Enlightenment.
Comment[sr]=Побошана плоча поставки Просвећења.
Icon=e-module-conf2
X-Enlightenment-ModuleType=core

@ -63,40 +63,6 @@ e_modapi_init(E_Module *m)
NULL, "preferences-system-windows",
e_int_config_apps_ibar_other);
{
E_Configure_Option *co;
e_configure_option_domain_current_set("conf_applications");
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "new app launcher", _("Create a new application launcher"), _("application"), _("exec"));
co->info = eina_stringshare_add("applications/new_application");
E_CONFIGURE_OPTION_ICON(co, "preferences-applications-add");
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "apps", _("Application launchers"), _("application"), _("exec"));
co->info = eina_stringshare_add("applications/personal_applications");
E_CONFIGURE_OPTION_ICON(co, "preferences-applications-personal");
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "favorite apps", _("Favorite applications"), _("application"), _("exec"));
co->info = eina_stringshare_add("applications/favorite_applications");
E_CONFIGURE_OPTION_ICON(co, "user-bookmarks");
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "ibar apps", _("Ibar applications"), _("application"), _("exec"));
co->info = eina_stringshare_add("applications/ibar_applications");
E_CONFIGURE_OPTION_ICON(co, "preferences-applications-ibar");
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "desklock apps", _("Desk lock applications"), _("application"), _("exec"), _("desklock"));
co->info = eina_stringshare_add("applications/screen_lock_applications");
E_CONFIGURE_OPTION_ICON(co, "preferences-applications-screen-lock");
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "deskunlock apps", _("Desk unlock applications"), _("application"), _("exec"), _("desklock"));
co->info = eina_stringshare_add("applications/screen_unlock_applications");
E_CONFIGURE_OPTION_ICON(co, "preferences-applications-screen-unlock");
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "restart apps", _("Enlightenment restart applications"), _("application"), _("exec"));
co->info = eina_stringshare_add("applications/restart_applications");
E_CONFIGURE_OPTION_ICON(co, "preferences-applications-restart");
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "startup apps", _("Enlightenment start applications"), _("application"), _("exec"), _("startup"));
co->info = eina_stringshare_add("applications/startup_applications");
E_CONFIGURE_OPTION_ICON(co, "preferences-applications-startup");
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "default apps", _("Enlightenment default applications"), _("application"), _("exec"));
co->info = eina_stringshare_add("applications/default_applications");
E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-default-applications");
}
conf_module = m;
e_module_delayed_set(m, 1);
return m;
@ -121,7 +87,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
e_configure_registry_item_del("applications/desktop_environments");
e_configure_registry_category_del("applications");
e_configure_option_domain_clear("conf_applications");
conf_module = NULL;
return 1;
}

@ -42,30 +42,6 @@ e_modapi_init(E_Module *m)
conf_module = m;
e_module_delayed_set(m, 1);
{
E_Configure_Option *co;
e_configure_option_domain_current_set("conf_bindings");
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "key bindings", _("Key binding settings"), _("input"), _("key"), _("binding"));
co->info = eina_stringshare_add("keyboard_and_mouse/key_bindings");
E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-keyboard-shortcuts");
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "mouse bindings", _("Mouse binding settings"), _("input"), _("mouse"), _("binding"));
co->info = eina_stringshare_add("keyboard_and_mouse/mouse_bindings");
E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-mouse");
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "ACPI bindings", _("ACPI binding settings"), _("input"), _("acpi"), _("binding"));
co->info = eina_stringshare_add("keyboard_and_mouse/acpi_bindings");
E_CONFIGURE_OPTION_ICON(co