conf2 and related subsystems were a fun and useful experiment, but this is not their time. removed.
see econf.git
|
@ -857,7 +857,6 @@ AC_E_OPTIONAL_MODULE([fileman], true)
|
||||||
AC_E_OPTIONAL_MODULE([fileman_opinfo], true)
|
AC_E_OPTIONAL_MODULE([fileman_opinfo], true)
|
||||||
AC_E_OPTIONAL_MODULE([wizard], true)
|
AC_E_OPTIONAL_MODULE([wizard], true)
|
||||||
AC_E_OPTIONAL_MODULE([conf], 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_comp], true)
|
||||||
AC_E_OPTIONAL_MODULE([conf_wallpaper2], true)
|
AC_E_OPTIONAL_MODULE([conf_wallpaper2], true)
|
||||||
AC_E_OPTIONAL_MODULE([conf_theme], true, 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/module.desktop
|
||||||
src/modules/fileman_opinfo/module.desktop
|
src/modules/fileman_opinfo/module.desktop
|
||||||
src/modules/conf/module.desktop
|
src/modules/conf/module.desktop
|
||||||
src/modules/conf2/module.desktop
|
|
||||||
src/modules/conf_wallpaper2/module.desktop
|
src/modules/conf_wallpaper2/module.desktop
|
||||||
src/modules/conf_theme/module.desktop
|
src/modules/conf_theme/module.desktop
|
||||||
src/modules/conf_intl/module.desktop
|
src/modules/conf_intl/module.desktop
|
||||||
|
|
|
@ -62,7 +62,6 @@ e_config_data.h \
|
||||||
e_config_dialog.h \
|
e_config_dialog.h \
|
||||||
e_config.h \
|
e_config.h \
|
||||||
e_configure.h \
|
e_configure.h \
|
||||||
e_configure_option.h \
|
|
||||||
e_confirm_dialog.h \
|
e_confirm_dialog.h \
|
||||||
e_container.h \
|
e_container.h \
|
||||||
e_datastore.h \
|
e_datastore.h \
|
||||||
|
@ -233,7 +232,6 @@ e_config.c \
|
||||||
e_config_data.c \
|
e_config_data.c \
|
||||||
e_config_dialog.c \
|
e_config_dialog.c \
|
||||||
e_configure.c \
|
e_configure.c \
|
||||||
e_configure_option.c \
|
|
||||||
e_confirm_dialog.c \
|
e_confirm_dialog.c \
|
||||||
e_container.c \
|
e_container.c \
|
||||||
e_datastore.c \
|
e_datastore.c \
|
||||||
|
|
283
src/bin/e_comp.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);
|
_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
|
static Eina_Bool
|
||||||
_e_comp_opacity_set_timer_cb(E_Comp_Win *cw)
|
_e_comp_opacity_set_timer_cb(E_Comp_Win *cw)
|
||||||
{
|
{
|
||||||
|
@ -5072,7 +4794,6 @@ e_comp_init(void)
|
||||||
if (!e_comp_wl_init())
|
if (!e_comp_wl_init())
|
||||||
EINA_LOG_ERR("Failed to initialize Wayland Client Support !!");
|
EINA_LOG_ERR("Failed to initialize Wayland Client Support !!");
|
||||||
#endif
|
#endif
|
||||||
_e_comp_cfg_init();
|
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -5108,10 +4829,6 @@ e_comp_shutdown(void)
|
||||||
e_comp_wl_shutdown();
|
e_comp_wl_shutdown();
|
||||||
#endif
|
#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;
|
gl_avail = EINA_FALSE;
|
||||||
e_comp_cfdata_config_free(conf);
|
e_comp_cfdata_config_free(conf);
|
||||||
E_CONFIG_DD_FREE(conf_match_edd);
|
E_CONFIG_DD_FREE(conf_match_edd);
|
||||||
|
|
|
@ -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_zoomap.h"
|
||||||
#include "e_dialog.h"
|
#include "e_dialog.h"
|
||||||
#include "e_configure.h"
|
#include "e_configure.h"
|
||||||
#include "e_configure_option.h"
|
|
||||||
#include "e_about.h"
|
#include "e_about.h"
|
||||||
#include "e_theme_about.h"
|
#include "e_theme_about.h"
|
||||||
#include "e_widget.h"
|
#include "e_widget.h"
|
||||||
|
|
|
@ -609,10 +609,6 @@ main(int argc, char **argv)
|
||||||
TS("E_Intl Post Init Done");
|
TS("E_Intl Post Init Done");
|
||||||
_e_main_shutdown_push(e_intl_post_shutdown);
|
_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();
|
e_screensaver_preinit();
|
||||||
|
|
||||||
if (e_config->show_splash)
|
if (e_config->show_splash)
|
||||||
|
@ -656,8 +652,6 @@ main(int argc, char **argv)
|
||||||
e_init_show();
|
e_init_show();
|
||||||
}
|
}
|
||||||
|
|
||||||
//configure_option_shutdown needs to be first
|
|
||||||
|
|
||||||
if (!really_know)
|
if (!really_know)
|
||||||
{
|
{
|
||||||
TS("Test File Format Support");
|
TS("Test File Format Support");
|
||||||
|
@ -1109,8 +1103,6 @@ _e_main_shutdown(int errcode)
|
||||||
if (_idle_flush) ecore_idle_enterer_del(_idle_flush);
|
if (_idle_flush) ecore_idle_enterer_del(_idle_flush);
|
||||||
_idle_flush = NULL;
|
_idle_flush = NULL;
|
||||||
|
|
||||||
e_configure_option_shutdown();
|
|
||||||
|
|
||||||
for (i = (_e_main_lvl - 1); i >= 0; i--)
|
for (i = (_e_main_lvl - 1); i >= 0; i--)
|
||||||
(*_e_main_shutdown_func[i])();
|
(*_e_main_shutdown_func[i])();
|
||||||
if (errcode < 0) exit(errcode);
|
if (errcode < 0) exit(errcode);
|
||||||
|
|
|
@ -91,10 +91,6 @@ if USE_MODULE_CONF
|
||||||
include Makefile_conf.am
|
include Makefile_conf.am
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if USE_MODULE_CONF2
|
|
||||||
include Makefile_conf2.am
|
|
||||||
endif
|
|
||||||
|
|
||||||
if USE_MODULE_CONF_COMP
|
if USE_MODULE_CONF_COMP
|
||||||
include Makefile_conf_comp.am
|
include Makefile_conf_comp.am
|
||||||
endif
|
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
|
|
|
@ -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
|
|
Before Width: | Height: | Size: 136 B |
Before Width: | Height: | Size: 74 B |
Before Width: | Height: | Size: 91 B |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 378 B |
Before Width: | Height: | Size: 504 B |
Before Width: | Height: | Size: 169 B |
Before Width: | Height: | Size: 486 B |
Before Width: | Height: | Size: 232 B |
Before Width: | Height: | Size: 346 B |
Before Width: | Height: | Size: 389 B |
Before Width: | Height: | Size: 718 B |
Before Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 4.0 KiB |
Before Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 761 B |
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",
|
NULL, "preferences-system-windows",
|
||||||
e_int_config_apps_ibar_other);
|
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;
|
conf_module = m;
|
||||||
e_module_delayed_set(m, 1);
|
e_module_delayed_set(m, 1);
|
||||||
return m;
|
return m;
|
||||||
|
@ -121,7 +87,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
e_configure_registry_item_del("applications/desktop_environments");
|
e_configure_registry_item_del("applications/desktop_environments");
|
||||||
e_configure_registry_category_del("applications");
|
e_configure_registry_category_del("applications");
|
||||||
|
|
||||||
e_configure_option_domain_clear("conf_applications");
|
|
||||||
conf_module = NULL;
|
conf_module = NULL;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,30 +42,6 @@ e_modapi_init(E_Module *m)
|
||||||
conf_module = m;
|
conf_module = m;
|
||||||
e_module_delayed_set(m, 1);
|
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, "preferences-system-power-management");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "edge bindings", _("Screen edge binding settings"), _("input"), _("edge"), _("screen"), _("binding"));
|
|
||||||
co->info = eina_stringshare_add("keyboard_and_mouse/edge_bindings");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-edge-bindings");
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "signal bindings", _("Edje signal binding settings"), _("input"), _("edje"), _("mouse"), _("binding"));
|
|
||||||
co->info = eina_stringshare_add("advanced/signal_bindings");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-signal-bindings");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,8 +69,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
e_configure_registry_category_del("keyboard_and_mouse");
|
e_configure_registry_category_del("keyboard_and_mouse");
|
||||||
e_configure_registry_category_del("advanced");
|
e_configure_registry_category_del("advanced");
|
||||||
|
|
||||||
e_configure_option_domain_clear("conf_bindings");
|
|
||||||
|
|
||||||
conf_module = NULL;
|
conf_module = NULL;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -252,14 +252,6 @@ e_modapi_init(E_Module *m)
|
||||||
mod->conf->first_draw_delay = 0.20;
|
mod->conf->first_draw_delay = 0.20;
|
||||||
|
|
||||||
_comp_mod = mod;
|
_comp_mod = mod;
|
||||||
{
|
|
||||||
E_Configure_Option *co;
|
|
||||||
|
|
||||||
e_configure_option_domain_current_set("conf_comp");
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "comp_settings", _("Advanced composite settings panel"), _("composite"), _("border"));
|
|
||||||
co->info = eina_stringshare_add("internal/comp_matches");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-composite");
|
|
||||||
}
|
|
||||||
|
|
||||||
e_module_delayed_set(m, 0);
|
e_module_delayed_set(m, 0);
|
||||||
e_module_priority_set(m, -1000);
|
e_module_priority_set(m, -1000);
|
||||||
|
@ -285,7 +277,6 @@ e_modapi_shutdown(E_Module *m)
|
||||||
}
|
}
|
||||||
|
|
||||||
free(mod);
|
free(mod);
|
||||||
e_configure_option_domain_clear("conf_comp");
|
|
||||||
|
|
||||||
if (maug)
|
if (maug)
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,16 +20,6 @@ e_modapi_init(E_Module *m)
|
||||||
conf_module = m;
|
conf_module = m;
|
||||||
e_module_delayed_set(m, 1);
|
e_module_delayed_set(m, 1);
|
||||||
|
|
||||||
{
|
|
||||||
E_Configure_Option *co;
|
|
||||||
|
|
||||||
e_configure_option_domain_current_set("conf_dialogs");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "profiles", _("Enlightenment profile settings"), _("profile"));
|
|
||||||
co->info = eina_stringshare_add("settings/profiles");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-profiles");
|
|
||||||
}
|
|
||||||
|
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,23 +30,6 @@ e_modapi_init(E_Module *m)
|
||||||
conf_module = m;
|
conf_module = m;
|
||||||
e_module_delayed_set(m, 1);
|
e_module_delayed_set(m, 1);
|
||||||
|
|
||||||
{
|
|
||||||
E_Configure_Option *co;
|
|
||||||
|
|
||||||
e_configure_option_domain_current_set("conf_intl");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "language", _("Language settings"), _("language"));
|
|
||||||
co->info = eina_stringshare_add("language/language_settings");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-locale");
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "desklock language", _("Desklock language settings"), _("desklock"), _("language"));
|
|
||||||
co->info = eina_stringshare_add("language/desklock_language_settings");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-desklock-locale");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "input method", _("Input method settings"), _("input"), _("language"));
|
|
||||||
co->info = eina_stringshare_add("language/input_method_settings");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-imc");
|
|
||||||
}
|
|
||||||
|
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -66,7 +49,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
e_configure_registry_item_del("language/language_settings");
|
e_configure_registry_item_del("language/language_settings");
|
||||||
e_configure_registry_category_del("language");
|
e_configure_registry_category_del("language");
|
||||||
|
|
||||||
e_configure_option_domain_clear("conf_intl");
|
|
||||||
conf_module = NULL;
|
conf_module = NULL;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,19 +27,6 @@ e_modapi_init(E_Module *m)
|
||||||
conf_module = m;
|
conf_module = m;
|
||||||
e_module_delayed_set(m, 1);
|
e_module_delayed_set(m, 1);
|
||||||
|
|
||||||
{
|
|
||||||
E_Configure_Option *co;
|
|
||||||
|
|
||||||
e_configure_option_domain_current_set("conf_paths");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "search directories", _("Search directory settings"), _("environment"));
|
|
||||||
co->info = eina_stringshare_add("advanced/search_directories");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-directories");
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "environment variables", _("Environment variable settings"), _("environment"));
|
|
||||||
co->info = eina_stringshare_add("advanced/environment_variables");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-variables");
|
|
||||||
}
|
|
||||||
|
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,7 +43,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
e_configure_registry_item_del("advanced/search_directories");
|
e_configure_registry_item_del("advanced/search_directories");
|
||||||
e_configure_registry_category_del("advanced");
|
e_configure_registry_category_del("advanced");
|
||||||
|
|
||||||
e_configure_option_domain_clear("conf_paths");
|
|
||||||
conf_module = NULL;
|
conf_module = NULL;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,16 +23,6 @@ e_modapi_init(E_Module *m)
|
||||||
"preferences-system-screen-resolution",
|
"preferences-system-screen-resolution",
|
||||||
e_int_config_randr);
|
e_int_config_randr);
|
||||||
|
|
||||||
{
|
|
||||||
E_Configure_Option *co;
|
|
||||||
|
|
||||||
e_configure_option_domain_current_set("conf_randr");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "randr", _("Screen resolution and orientation settings"), _("screen"), _("size"));
|
|
||||||
co->info = eina_stringshare_add("screen/screen_setup");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-system-screen-resolution");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* return the module */
|
/* return the module */
|
||||||
return m;
|
return m;
|
||||||
|
@ -55,8 +45,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
* NB: If there are other items in 'screen' then this function is a no-op */
|
* NB: If there are other items in 'screen' then this function is a no-op */
|
||||||
e_configure_registry_category_del("screen");
|
e_configure_registry_category_del("screen");
|
||||||
|
|
||||||
e_configure_option_domain_clear("conf_randr");
|
|
||||||
|
|
||||||
/* return 1 for shutdown success */
|
/* return 1 for shutdown success */
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,16 +30,6 @@ e_modapi_init(E_Module *m)
|
||||||
conf_module = m;
|
conf_module = m;
|
||||||
e_module_delayed_set(m, 1);
|
e_module_delayed_set(m, 1);
|
||||||
|
|
||||||
{
|
|
||||||
E_Configure_Option *co;
|
|
||||||
|
|
||||||
e_configure_option_domain_current_set("conf_shelves");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "shelves", _("Shelf settings"), _("shelf"), _("desktop"));
|
|
||||||
co->info = eina_stringshare_add("extensions/shelves");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-shelf");
|
|
||||||
}
|
|
||||||
|
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -59,8 +49,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
e_configure_registry_item_del("extensions/shelves");
|
e_configure_registry_item_del("extensions/shelves");
|
||||||
e_configure_registry_category_del("extensions");
|
e_configure_registry_category_del("extensions");
|
||||||
|
|
||||||
e_configure_option_domain_clear("conf_shelves");
|
|
||||||
|
|
||||||
conf_module = NULL;
|
conf_module = NULL;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -608,19 +608,16 @@ static void *
|
||||||
_create_data(E_Config_Dialog *cfd)
|
_create_data(E_Config_Dialog *cfd)
|
||||||
{
|
{
|
||||||
E_Config_Dialog_Data *cfdata;
|
E_Config_Dialog_Data *cfdata;
|
||||||
char theme_dir[PATH_MAX];
|
|
||||||
|
|
||||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||||
cfd->cfdata = cfdata;
|
cfd->cfdata = cfdata;
|
||||||
cfdata->cfd = cfd;
|
cfdata->cfd = cfd;
|
||||||
_fill_data(cfdata);
|
_fill_data(cfdata);
|
||||||
/* Grab the "Personal" themes. */
|
/* Grab the "Personal" themes. */
|
||||||
snprintf(theme_dir, sizeof(theme_dir), "%s", elm_theme_user_dir_get());
|
cfdata->init[0] = eio_file_ls(elm_theme_user_dir_get(), _eio_filter_cb, _init_main_cb, _init_done_cb, _init_error_cb, cfdata);
|
||||||
cfdata->init[0] = eio_file_ls(theme_dir, _eio_filter_cb, _init_main_cb, _init_done_cb, _init_error_cb, cfdata);
|
|
||||||
|
|
||||||
/* Grab the "System" themes. */
|
/* Grab the "System" themes. */
|
||||||
snprintf(theme_dir, sizeof(theme_dir), "%s", elm_theme_system_dir_get());
|
cfdata->init[1] = eio_file_ls(elm_theme_system_dir_get(), _eio_filter_cb, _init_main_cb, _init_done_cb, _init_error_cb, cfdata);
|
||||||
cfdata->init[1] = eio_file_ls(theme_dir, _eio_filter_cb, _init_main_cb, _init_done_cb, _init_error_cb, cfdata);
|
|
||||||
return cfdata;
|
return cfdata;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,11 +5,13 @@ static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdat
|
||||||
static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||||
static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||||
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
|
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
|
||||||
|
//static int _sort_widget_themes(const void *data1, const void *data2);
|
||||||
//static Evas_Object *_icon_new(Evas *evas, const char *theme, const char *icon, unsigned int size);
|
//static Evas_Object *_icon_new(Evas *evas, const char *theme, const char *icon, unsigned int size);
|
||||||
|
|
||||||
struct _E_Config_Dialog_Data
|
struct _E_Config_Dialog_Data
|
||||||
{
|
{
|
||||||
E_Config_Dialog *cfd;
|
E_Config_Dialog *cfd;
|
||||||
|
Eina_List *widget_themes;
|
||||||
const char *widget_theme;
|
const char *widget_theme;
|
||||||
int enable_xsettings;
|
int enable_xsettings;
|
||||||
int match_e17_theme;
|
int match_e17_theme;
|
||||||
|
@ -171,6 +173,19 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
_sort_widget_themes(const void *data1, const void *data2)
|
||||||
|
{
|
||||||
|
const char *d1, *d2;
|
||||||
|
|
||||||
|
d1 = data1;
|
||||||
|
d2 = data2;
|
||||||
|
if (!d1) return 1;
|
||||||
|
if (!d2) return -1;
|
||||||
|
|
||||||
|
return strcmp(d1, d2);
|
||||||
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
_sort_icon_themes(const void *data1, const void *data2)
|
_sort_icon_themes(const void *data1, const void *data2)
|
||||||
{
|
{
|
||||||
|
@ -187,65 +202,111 @@ _sort_icon_themes(const void *data1, const void *data2)
|
||||||
return strcmp(m1->name.name, m2->name.name);
|
return strcmp(m1->name.name, m2->name.name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_ilist_files_add(E_Config_Dialog_Data *cfdata, const char *dir)
|
||||||
|
{
|
||||||
|
Eina_Iterator *it;
|
||||||
|
const char *file;
|
||||||
|
|
||||||
|
it = eina_file_ls(dir);
|
||||||
|
if (!it) return;
|
||||||
|
|
||||||
|
EINA_ITERATOR_FOREACH(it, file)
|
||||||
|
{
|
||||||
|
if ((ecore_file_is_dir(file)) &&
|
||||||
|
(!eina_list_data_find(cfdata->widget_themes, file)))
|
||||||
|
{
|
||||||
|
cfdata->widget_themes = eina_list_append(cfdata->widget_themes, file);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
eina_stringshare_del(file);
|
||||||
|
}
|
||||||
|
|
||||||
|
eina_iterator_free(it);
|
||||||
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_fill_files_ilist(void *data)
|
_fill_files_ilist(void *data)
|
||||||
{
|
{
|
||||||
Evas *evas;
|
Evas *evas;
|
||||||
Evas_Object *o;
|
Evas_Object *o;
|
||||||
|
char theme_dir[4096];
|
||||||
E_Config_Dialog_Data *cfdata = data;
|
E_Config_Dialog_Data *cfdata = data;
|
||||||
const Eina_List *l;
|
Eina_List *xdg_dirs, *l;
|
||||||
Eina_Stringshare *dir;
|
const char *dir;
|
||||||
int cnt = 0;
|
|
||||||
|
|
||||||
if (!(o = cfdata->gui.widget_list))
|
if (!(o = cfdata->gui.widget_list))
|
||||||
return ECORE_CALLBACK_CANCEL;
|
return ECORE_CALLBACK_CANCEL;
|
||||||
|
|
||||||
|
e_user_homedir_concat_static(theme_dir, ".themes");
|
||||||
|
_ilist_files_add(cfdata, theme_dir);
|
||||||
|
|
||||||
|
xdg_dirs = efreet_data_dirs_get();
|
||||||
|
EINA_LIST_FOREACH(xdg_dirs, l, dir)
|
||||||
|
{
|
||||||
|
snprintf(theme_dir, sizeof(theme_dir), "%s/themes", dir);
|
||||||
|
_ilist_files_add(cfdata, theme_dir);
|
||||||
|
}
|
||||||
|
|
||||||
evas = evas_object_evas_get(o);
|
evas = evas_object_evas_get(o);
|
||||||
evas_event_freeze(evas);
|
evas_event_freeze(evas);
|
||||||
edje_freeze();
|
edje_freeze();
|
||||||
e_widget_ilist_freeze(o);
|
e_widget_ilist_freeze(o);
|
||||||
e_widget_ilist_clear(o);
|
e_widget_ilist_clear(o);
|
||||||
|
|
||||||
EINA_LIST_FOREACH(e_configure_option_util_themes_gtk_get(), l, dir)
|
if (cfdata->widget_themes)
|
||||||
{
|
{
|
||||||
const char *tmp;
|
const char *theme;
|
||||||
char buf[PATH_MAX];
|
int cnt = 0;
|
||||||
Eina_Bool gtk2 = EINA_FALSE;
|
|
||||||
Eina_Bool gtk3 = EINA_FALSE;
|
|
||||||
char label[256];
|
|
||||||
const char *value;
|
|
||||||
ssize_t len = sizeof(label);
|
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "%s/gtk-2.0", dir);
|
cfdata->widget_themes = eina_list_sort(cfdata->widget_themes, -1, _sort_widget_themes);
|
||||||
gtk2 = ecore_file_is_dir(buf);
|
|
||||||
snprintf(buf, sizeof(buf), "%s/gtk-3.0", dir);
|
|
||||||
gtk3 = ecore_file_is_dir(buf);
|
|
||||||
if ((!gtk2) && (!gtk3)) continue;
|
|
||||||
|
|
||||||
tmp = ecore_file_file_get(dir);
|
EINA_LIST_FREE(cfdata->widget_themes, theme)
|
||||||
if (!tmp) continue;
|
|
||||||
value = eina_stringshare_add(tmp);
|
|
||||||
label[0] = 0;
|
|
||||||
strncpy(label, value, len);
|
|
||||||
len -= strlen(label);
|
|
||||||
if (gtk2 && (len > 5))
|
|
||||||
{
|
{
|
||||||
strcat(label, " (v2)");
|
const char *tmp;
|
||||||
len -= 5;
|
char buf[PATH_MAX];
|
||||||
|
Eina_Bool gtk2 = EINA_FALSE;
|
||||||
|
Eina_Bool gtk3 = EINA_FALSE;
|
||||||
|
snprintf(buf, sizeof(buf), "%s/gtk-2.0", theme);
|
||||||
|
gtk2 = ecore_file_is_dir(buf);
|
||||||
|
snprintf(buf, sizeof(buf), "%s/gtk-3.0", theme);
|
||||||
|
gtk3 = ecore_file_is_dir(buf);
|
||||||
|
if ((!gtk2) && (!gtk3)) continue;
|
||||||
|
|
||||||
|
tmp = strrchr(theme, '/');
|
||||||
|
if (tmp)
|
||||||
|
{
|
||||||
|
char label[256];
|
||||||
|
const char *value;
|
||||||
|
ssize_t len = sizeof(label);
|
||||||
|
|
||||||
|
tmp += 1;
|
||||||
|
value = eina_stringshare_add(tmp);
|
||||||
|
label[0] = 0;
|
||||||
|
strncpy(label, value, len);
|
||||||
|
len -= strlen(label);
|
||||||
|
if (gtk2 && (len > 5))
|
||||||
|
{
|
||||||
|
strcat(label, " (v2)");
|
||||||
|
len -= 5;
|
||||||
|
}
|
||||||
|
if (gtk3 && (len > 5))
|
||||||
|
{
|
||||||
|
strcat(label, " (v3)");
|
||||||
|
len -= 5;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* value pointer will exist as long as ilist item
|
||||||
|
so val remains valid */
|
||||||
|
e_widget_ilist_append(o, NULL, label, NULL, NULL, value);
|
||||||
|
if ((e_config->xsettings.net_theme_name_detected == value) || (cfdata->widget_theme == value))
|
||||||
|
e_widget_ilist_selected_set(cfdata->gui.widget_list, cnt);
|
||||||
|
eina_stringshare_del(value);
|
||||||
|
cnt++;
|
||||||
|
}
|
||||||
|
|
||||||
|
eina_stringshare_del(theme);
|
||||||
}
|
}
|
||||||
if (gtk3 && (len > 5))
|
|
||||||
{
|
|
||||||
strcat(label, " (v3)");
|
|
||||||
len -= 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* value pointer will exist as long as ilist item
|
|
||||||
so val remains valid */
|
|
||||||
e_widget_ilist_append(o, NULL, label, NULL, NULL, value);
|
|
||||||
if ((e_config->xsettings.net_theme_name_detected == value) || (cfdata->widget_theme == value))
|
|
||||||
e_widget_ilist_selected_set(cfdata->gui.widget_list, cnt);
|
|
||||||
eina_stringshare_del(value);
|
|
||||||
cnt++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
e_widget_ilist_go(o);
|
e_widget_ilist_go(o);
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#include "e.h"
|
#include "e.h"
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
|
|
||||||
static const char *cur_theme = NULL;
|
|
||||||
|
|
||||||
static E_Module *conf_module = NULL;
|
static E_Module *conf_module = NULL;
|
||||||
static E_Int_Menu_Augmentation *maug[8] = {0};
|
static E_Int_Menu_Augmentation *maug[8] = {0};
|
||||||
|
@ -37,87 +36,15 @@ _e_mod_run_theme_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__
|
||||||
e_configure_registry_call("appearance/theme", m->zone->container, NULL);
|
e_configure_registry_call("appearance/theme", m->zone->container, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
_theme_set(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
|
|
||||||
{
|
|
||||||
E_Action *a;
|
|
||||||
const char *file;
|
|
||||||
char *name;
|
|
||||||
|
|
||||||
file = ecore_file_file_get(data);
|
|
||||||
name = ecore_file_strip_ext(file);
|
|
||||||
if (name)
|
|
||||||
{
|
|
||||||
elm_theme_set(NULL, name);
|
|
||||||
elm_config_all_flush();
|
|
||||||
elm_config_save();
|
|
||||||
free(name);
|
|
||||||
a = e_action_find("restart");
|
|
||||||
if ((a) && (a->func.go)) a->func.go(NULL, NULL);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_item_new(Eina_Stringshare *file, E_Menu *m)
|
|
||||||
{
|
|
||||||
E_Menu_Item *mi;
|
|
||||||
char *name, *sfx;
|
|
||||||
Eina_Bool used;
|
|
||||||
|
|
||||||
name = (char*)ecore_file_file_get(file);
|
|
||||||
if (!name) return;
|
|
||||||
used = (!e_util_strcmp(name, cur_theme));
|
|
||||||
sfx = strrchr(name, '.');
|
|
||||||
name = strndupa(name, sfx - name);
|
|
||||||
mi = e_menu_item_new(m);
|
|
||||||
e_menu_item_label_set(mi, name);
|
|
||||||
if (used)
|
|
||||||
e_menu_item_disabled_set(mi, 1);
|
|
||||||
else
|
|
||||||
e_menu_item_callback_set(mi, _theme_set, file);
|
|
||||||
e_menu_item_radio_group_set(mi, 1);
|
|
||||||
e_menu_item_radio_set(mi, 1);
|
|
||||||
e_menu_item_toggle_set(mi, used);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_e_mod_menu_theme_del(void *d __UNUSED__)
|
|
||||||
{
|
|
||||||
cur_theme = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_e_mod_menu_theme_add(void *data __UNUSED__, E_Menu *m)
|
_e_mod_menu_theme_add(void *data __UNUSED__, E_Menu *m)
|
||||||
{
|
{
|
||||||
E_Menu_Item *mi;
|
E_Menu_Item *mi;
|
||||||
Eina_Stringshare *file;
|
|
||||||
const Eina_List *themes, *sthemes, *l;
|
|
||||||
const char *theme;
|
|
||||||
static char buf[PATH_MAX];
|
|
||||||
|
|
||||||
mi = e_menu_item_new(m);
|
mi = e_menu_item_new(m);
|
||||||
e_menu_item_label_set(mi, _("Theme"));
|
e_menu_item_label_set(mi, _("Theme"));
|
||||||
e_util_menu_item_theme_icon_set(mi, "preferences-desktop-theme");
|
e_util_menu_item_theme_icon_set(mi, "preferences-desktop-theme");
|
||||||
e_menu_item_callback_set(mi, _e_mod_run_theme_cb, NULL);
|
e_menu_item_callback_set(mi, _e_mod_run_theme_cb, NULL);
|
||||||
theme = elm_theme_get(NULL);
|
|
||||||
if (!theme) return;
|
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "%s.edj", theme);
|
|
||||||
cur_theme = buf;
|
|
||||||
m = e_menu_new();
|
|
||||||
e_object_del_attach_func_set(E_OBJECT(m), _e_mod_menu_theme_del);
|
|
||||||
e_menu_title_set(m, _("Themes"));
|
|
||||||
e_menu_item_submenu_set(mi, m);
|
|
||||||
e_object_unref(E_OBJECT(m));
|
|
||||||
|
|
||||||
themes = e_configure_option_util_themes_get();
|
|
||||||
sthemes = e_configure_option_util_themes_system_get();
|
|
||||||
EINA_LIST_FOREACH(themes, l, file)
|
|
||||||
_item_new(file, m);
|
|
||||||
if (themes && sthemes)
|
|
||||||
e_menu_item_separator_set(e_menu_item_new(m), 1);
|
|
||||||
EINA_LIST_FOREACH(sthemes, l, file)
|
|
||||||
_item_new(file, m);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void *
|
EAPI void *
|
||||||
|
@ -167,28 +94,6 @@ e_modapi_init(E_Module *m)
|
||||||
conf_module = m;
|
conf_module = m;
|
||||||
e_module_delayed_set(m, 1);
|
e_module_delayed_set(m, 1);
|
||||||
|
|
||||||
{
|
|
||||||
E_Configure_Option *co;
|
|
||||||
|
|
||||||
e_configure_option_domain_current_set("conf_theme");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "themes", _("Enlightenment theme settings"), _("theme"));
|
|
||||||
co->info = eina_stringshare_add("appearance/theme");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-theme");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "wallpaper", _("Desktop wallpaper settings"), _("wallpaper"));
|
|
||||||
co->info = eina_stringshare_add("appearance/wallpaper");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-wallpaper");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "colors", _("Enlightenment color settings"), _("theme"), _("color"));
|
|
||||||
co->info = eina_stringshare_add("appearance/colors");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-color");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "fonts", _("Enlightenment font settings"), _("font"));
|
|
||||||
co->info = eina_stringshare_add("appearance/fonts");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-font");
|
|
||||||
}
|
|
||||||
|
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -209,8 +114,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
maug[1] = NULL;
|
maug[1] = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
cur_theme = NULL;
|
|
||||||
|
|
||||||
while ((cfd = e_config_dialog_get("E", "appearance/scale")))
|
while ((cfd = e_config_dialog_get("E", "appearance/scale")))
|
||||||
e_object_del(E_OBJECT(cfd));
|
e_object_del(E_OBJECT(cfd));
|
||||||
while ((cfd = e_config_dialog_get("E", "appearance/transitions")))
|
while ((cfd = e_config_dialog_get("E", "appearance/transitions")))
|
||||||
|
@ -246,8 +149,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
e_configure_registry_item_del("internal/wallpaper_desk");
|
e_configure_registry_item_del("internal/wallpaper_desk");
|
||||||
e_configure_registry_category_del("internal");
|
e_configure_registry_category_del("internal");
|
||||||
|
|
||||||
e_configure_option_domain_clear("conf_theme");
|
|
||||||
|
|
||||||
conf_module = NULL;
|
conf_module = NULL;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,16 +20,6 @@ e_modapi_init(E_Module *m)
|
||||||
conf_module = m;
|
conf_module = m;
|
||||||
e_module_delayed_set(m, 1);
|
e_module_delayed_set(m, 1);
|
||||||
|
|
||||||
{
|
|
||||||
E_Configure_Option *co;
|
|
||||||
|
|
||||||
e_configure_option_domain_current_set("conf_window_remembers");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "window remembers", _("Window remember settings"), _("border"), _("remember"));
|
|
||||||
co->info = eina_stringshare_add("windows/window_remembers");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-window-remember");
|
|
||||||
}
|
|
||||||
|
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,7 +33,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
e_configure_registry_item_del("windows/window_remembers");
|
e_configure_registry_item_del("windows/window_remembers");
|
||||||
e_configure_registry_category_del("windows");
|
e_configure_registry_category_del("windows");
|
||||||
|
|
||||||
e_configure_option_domain_clear("conf_window_remembers");
|
|
||||||
conf_module = NULL;
|
conf_module = NULL;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,16 +63,6 @@ e_modapi_init(E_Module *m)
|
||||||
e_configure_registry_item_add
|
e_configure_registry_item_add
|
||||||
("launcher/run_everything", 40, _("Everything Configuration"),
|
("launcher/run_everything", 40, _("Everything Configuration"),
|
||||||
NULL, module_icon, evry_config_dialog);
|
NULL, module_icon, evry_config_dialog);
|
||||||
{
|
|
||||||
E_Configure_Option *co;
|
|
||||||
|
|
||||||
e_configure_option_domain_current_set("everything");
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "settings", _("Everything launcher settings"), _("exec"), _("everything"));
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, module_icon);
|
|
||||||
co->info = eina_stringshare_add("launcher/run_everything");
|
|
||||||
e_configure_option_category_tag_add(_("everything"), _("everything"));
|
|
||||||
e_configure_option_category_icon_set(_("everything"), module_icon);;
|
|
||||||
}
|
|
||||||
evry_init();
|
evry_init();
|
||||||
|
|
||||||
_evry_type_init("NONE");
|
_evry_type_init("NONE");
|
||||||
|
@ -172,8 +162,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
|
|
||||||
em->active = EINA_FALSE;
|
em->active = EINA_FALSE;
|
||||||
}
|
}
|
||||||
e_configure_option_category_tag_del(_("everything"), _("everything"));
|
|
||||||
e_configure_option_domain_clear("everything");
|
|
||||||
|
|
||||||
evry_plug_apps_shutdown();
|
evry_plug_apps_shutdown();
|
||||||
evry_plug_files_shutdown();
|
evry_plug_files_shutdown();
|
||||||
|
|
|
@ -48,8 +48,6 @@ e_modapi_init(E_Module *m)
|
||||||
e_int_config_mime);
|
e_int_config_mime);
|
||||||
/* Setup Config edd */
|
/* Setup Config edd */
|
||||||
_e_mod_fileman_config_load();
|
_e_mod_fileman_config_load();
|
||||||
e_configure_option_category_tag_add(_("files"), _("files"));
|
|
||||||
e_configure_option_category_icon_set(_("files"), "system-file-manager");
|
|
||||||
|
|
||||||
/* add module supplied action */
|
/* add module supplied action */
|
||||||
act = e_action_add("fileman");
|
act = e_action_add("fileman");
|
||||||
|
@ -158,11 +156,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
e_configure_registry_category_del("fileman");
|
e_configure_registry_category_del("fileman");
|
||||||
|
|
||||||
e_config_domain_save("module.fileman", conf_edd, fileman_config);
|
e_config_domain_save("module.fileman", conf_edd, fileman_config);
|
||||||
e_configure_option_category_tag_del(_("files"), _("files"));
|
|
||||||
e_configure_option_tag_alias_del(_("files"), _("filemanager"));
|
|
||||||
e_configure_option_tag_alias_del(_("files"), _("file manager"));
|
|
||||||
|
|
||||||
e_configure_option_domain_clear("fileman");
|
|
||||||
_e_mod_fileman_config_free();
|
_e_mod_fileman_config_free();
|
||||||
E_CONFIG_DD_FREE(conf_edd);
|
E_CONFIG_DD_FREE(conf_edd);
|
||||||
E_CONFIG_DD_FREE(paths_edd);
|
E_CONFIG_DD_FREE(paths_edd);
|
||||||
|
@ -232,52 +226,6 @@ _e_mod_menu_add(void *data __UNUSED__, E_Menu *m)
|
||||||
e_mod_menu_add(m, NULL);
|
e_mod_menu_add(m, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_List *
|
|
||||||
_cfg_view_mode_info_cb(E_Configure_Option *co)
|
|
||||||
{
|
|
||||||
Eina_List *ret = NULL;
|
|
||||||
E_Configure_Option_Info *oi;
|
|
||||||
int x;
|
|
||||||
const char *name[] =
|
|
||||||
{
|
|
||||||
"Grid-placed icons", //1
|
|
||||||
"Custom-placed icons", //2
|
|
||||||
NULL, //3
|
|
||||||
NULL, //4
|
|
||||||
"List icons"//5
|
|
||||||
};
|
|
||||||
|
|
||||||
for (x = E_FM2_VIEW_MODE_GRID_ICONS; x <= E_FM2_VIEW_MODE_LIST; x++)
|
|
||||||
{
|
|
||||||
if (!name[x - 1]) continue;
|
|
||||||
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_List *
|
|
||||||
_cfg_toolbar_orient_cb_info_cb(E_Configure_Option *co)
|
|
||||||
{
|
|
||||||
Eina_List *ret = NULL;
|
|
||||||
E_Configure_Option_Info *oi;
|
|
||||||
int x;
|
|
||||||
const char *name[] =
|
|
||||||
{
|
|
||||||
"Top",
|
|
||||||
"Bottom"
|
|
||||||
};
|
|
||||||
|
|
||||||
for (x = E_GADCON_ORIENT_TOP; x <= E_GADCON_ORIENT_BOTTOM; x++)
|
|
||||||
{
|
|
||||||
oi = e_configure_option_info_new(co, _(name[x - E_GADCON_ORIENT_TOP]), (intptr_t*)(long)x);
|
|
||||||
oi->current = (*(int*)co->valptr == x);
|
|
||||||
ret = eina_list_append(ret, oi);
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Abstract fileman config load/create to one function for maintainability */
|
/* Abstract fileman config load/create to one function for maintainability */
|
||||||
static void
|
static void
|
||||||
_e_mod_fileman_config_load(void)
|
_e_mod_fileman_config_load(void)
|
||||||
|
@ -381,78 +329,6 @@ _e_mod_fileman_config_load(void)
|
||||||
|
|
||||||
fileman_config->view.menu_shows_files = 0;
|
fileman_config->view.menu_shows_files = 0;
|
||||||
|
|
||||||
{
|
|
||||||
E_Configure_Option *co;
|
|
||||||
|
|
||||||
e_configure_option_domain_current_set("fileman");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, ENUM, view.mode, fileman_config, _("Default view mode"), _("files"));
|
|
||||||
co->info_cb = _cfg_view_mode_info_cb;
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "system-file-manager");
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, DOUBLE_INT, icon.icon.w, fileman_config, _("Icon size"), _("files"), _("image"));
|
|
||||||
E_CONFIGURE_OPTION_MINMAX_STEP_FMT(co, 16, 256, 1, _("%1.0f pixels"));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, icon.extension.show, fileman_config, _("Show file extensions"), _("files"));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, view.show_full_path, fileman_config, _("Show full path in filemanager window titles"), _("files"), _("border"));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, view.show_toolbar, fileman_config, _("Show path toolbar in filemanager windows"), _("files"));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, ENUM, view.toolbar_orient, fileman_config, _("Filemanager path toolbar position"), _("files"));
|
|
||||||
co->info_cb = _cfg_toolbar_orient_cb_info_cb;
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "system-file-manager");
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, view.show_sidebar, fileman_config, _("Show favorites sidebar in filemanager windows"), _("files"));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, list.sort.no_case, fileman_config, _("Ignore letter case when sorting files"), _("files"));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, list.sort.extension, fileman_config, _("Group files by extension"), _("files"));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, list.sort.mtime, fileman_config, _("Sort files by modification time"), _("files"));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, list.sort.size, fileman_config, _("Sort files by size"), _("files"), _("size"));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
|
|
||||||
/* FIXME: exclusive */
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, list.sort.dirs.first, fileman_config, _("Sort directories first"), _("files"));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, list.sort.dirs.last, fileman_config, _("Sort directories last"), _("files"));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, view.open_dirs_in_place, fileman_config, _("Open directories in place"), _("files"));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, view.single_click, fileman_config, _("Use single click to open files"), _("files"));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, selection.windows_modifiers, fileman_config, _("Use alternate (Mac-style) selection modifiers"), _("files"), _("key"));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, view.desktop_navigation, fileman_config, _("Allow navigation on desktop"), _("files"));
|
|
||||||
E_CONFIGURE_OPTION_HELP(co, _("Normally, icons on the desktop come from $XDG_HOME_DIR/Desktop[-$SCREEN]. "
|
|
||||||
"With this option enabled, the desktop can freely change directories using the Navigate "
|
|
||||||
"menu or type buffer."));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, DOUBLE_UINT, icon.max_thumb_size, fileman_config, _("Maximum file size for which thumbnails should be generated"), _("files"), _("size"), _("image"));
|
|
||||||
E_CONFIGURE_OPTION_MINMAX_STEP_FMT(co, 0, 512, 1, _("%1.0f MiB"));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, DOUBLE, view.spring_delay, fileman_config, _("Spring folder delay"), _("files"), _("delay"));
|
|
||||||
E_CONFIGURE_OPTION_HELP(co, _("A \"spring folder\" is the action that occurs when dragging a file onto a folder: "
|
|
||||||
"the folder will \"spring\" open and create a new window to continue the drag operation in."));
|
|
||||||
E_CONFIGURE_OPTION_MINMAX_STEP_FMT(co, 1, 10, 1, _("%1.0f seconds"));
|
|
||||||
co->funcs[1].none = co->funcs[0].none = e_fwin_reload_all;
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "settings", _("File icons"), _("files"), _("image"));
|
|
||||||
co->info = eina_stringshare_add("fileman/file_icons");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-file-icons");
|
|
||||||
|
|
||||||
e_configure_option_tag_alias_add(_("files"), _("filemanager"));
|
|
||||||
e_configure_option_tag_alias_add(_("files"), _("file manager"));
|
|
||||||
}
|
|
||||||
|
|
||||||
e_config_save_queue();
|
e_config_save_queue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -117,52 +117,6 @@ _notification_cb_initial_mode_timer(Config *m_cfg)
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_List *
|
|
||||||
_notification_corner_info_cb(E_Configure_Option *co)
|
|
||||||
{
|
|
||||||
Eina_List *ret = NULL;
|
|
||||||
E_Configure_Option_Info *oi;
|
|
||||||
int x;
|
|
||||||
const char *name[] =
|
|
||||||
{
|
|
||||||
"Top left corner",
|
|
||||||
"Top right corner",
|
|
||||||
"Bottom left corner",
|
|
||||||
"Bottom right corner",
|
|
||||||
};
|
|
||||||
|
|
||||||
for (x = 0; x <= CORNER_BR; 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Eina_List *
|
|
||||||
_notification_screen_info_cb(E_Configure_Option *co)
|
|
||||||
{
|
|
||||||
Eina_List *ret = NULL;
|
|
||||||
E_Configure_Option_Info *oi;
|
|
||||||
int x;
|
|
||||||
const char *name[] =
|
|
||||||
{
|
|
||||||
"Primary screen",
|
|
||||||
"Current screen",
|
|
||||||
"All screens",
|
|
||||||
"Xinerama",
|
|
||||||
};
|
|
||||||
|
|
||||||
for (x = 0; x <= POPUP_DISPLAY_POLICY_MULTI; 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Module Api Functions */
|
/* Module Api Functions */
|
||||||
EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, "Notification"};
|
EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, "Notification"};
|
||||||
|
|
||||||
|
@ -191,7 +145,6 @@ EAPI void *
|
||||||
e_modapi_init(E_Module *m)
|
e_modapi_init(E_Module *m)
|
||||||
{
|
{
|
||||||
char buf[PATH_MAX];
|
char buf[PATH_MAX];
|
||||||
E_Configure_Option *co;
|
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "%s/e-module-notification.edj", m->dir);
|
snprintf(buf, sizeof(buf), "%s/e-module-notification.edj", m->dir);
|
||||||
/* register config panel entry */
|
/* register config panel entry */
|
||||||
|
@ -257,24 +210,6 @@ e_modapi_init(E_Module *m)
|
||||||
|
|
||||||
notification_mod = m;
|
notification_mod = m;
|
||||||
|
|
||||||
e_configure_option_domain_current_set("notification");
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, show_low, notification_cfg, _("Display low urgency notifications"), _("notification"));
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, show_normal, notification_cfg, _("Display normal urgency notifications"), _("notification"));
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, show_critical, notification_cfg, _("Display high urgency notifications"), _("notification"));
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, force_timeout, notification_cfg, _("Force a specified timeout on all notifications"), _("notification"), _("delay"));
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, DOUBLE, timeout, notification_cfg, _("Timeout to force on notifications"), _("notification"), _("delay"));
|
|
||||||
E_CONFIGURE_OPTION_MINMAX_STEP_FMT(co, 0.0, 15.0, 0.1, _("%.1f seconds"));
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, ENUM, dual_screen, notification_cfg, _("Screen(s) on which to display notifications"), _("notification"), _("screen"));
|
|
||||||
co->info_cb = _notification_screen_info_cb;
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, buf);
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, ENUM, corner, notification_cfg, _("Corner in which to display notifications"), _("notification"), _("screen"));
|
|
||||||
co->info_cb = _notification_corner_info_cb;
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, buf);
|
|
||||||
|
|
||||||
e_configure_option_category_tag_add(_("screen"), _("notification"));
|
|
||||||
e_configure_option_category_tag_add(_("notification"), _("notification"));
|
|
||||||
e_configure_option_category_icon_set(_("notification"), buf);
|
|
||||||
|
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -295,9 +230,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
e_notification_server_unregister();
|
e_notification_server_unregister();
|
||||||
|
|
||||||
|
|
||||||
e_configure_option_domain_clear("notification");
|
|
||||||
e_configure_option_category_tag_del(_("screen"), _("notification"));
|
|
||||||
e_configure_option_category_tag_del(_("notification"), _("notification"));
|
|
||||||
_notification_cfg_free(notification_cfg);
|
_notification_cfg_free(notification_cfg);
|
||||||
E_CONFIG_DD_FREE(conf_edd);
|
E_CONFIG_DD_FREE(conf_edd);
|
||||||
notification_mod = NULL;
|
notification_mod = NULL;
|
||||||
|
|
|
@ -29,7 +29,6 @@ EAPI void *
|
||||||
e_modapi_init(E_Module *m)
|
e_modapi_init(E_Module *m)
|
||||||
{
|
{
|
||||||
char buf[PATH_MAX];
|
char buf[PATH_MAX];
|
||||||
E_Configure_Option *co;
|
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(m));
|
snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(m));
|
||||||
e_configure_registry_category_add("launcher", 80, _("Launcher"), NULL,
|
e_configure_registry_category_add("launcher", 80, _("Launcher"), NULL,
|
||||||
|
@ -64,25 +63,6 @@ e_modapi_init(E_Module *m)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
e_configure_option_domain_current_set("quickaccess");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "settings", _("Quickaccess settings panel"), _("quickaccess"), _("border"));
|
|
||||||
co->info = eina_stringshare_add("launcher/quickaccess");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, buf);
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, hide_when_behind, qa_config, _("Hide windows on activate instead of raising"), _("quickaccess"), _("border"));
|
|
||||||
E_CONFIGURE_OPTION_HELP(co, _("By default, activating a Quickaccess binding when the window is behind other windows will raise the window. "
|
|
||||||
"This option changes that behavior to hide the window instead."));
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, autohide, qa_config, _("Hide windows when focus is lost"), _("quickaccess"), _("border"), _("focus"));
|
|
||||||
E_CONFIGURE_OPTION_HELP(co, _("This option causes Quickaccess windows to automatically hide when they lose focus"));
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, skip_taskbar, qa_config, _("Skip taskbar"), _("quickaccess"), _("border"));
|
|
||||||
E_CONFIGURE_OPTION_HELP(co, _("This option causes Quickaccess windows to not show up in taskbars"));
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, skip_pager, qa_config, _("Skip pager"), _("quickaccess"), _("border"));
|
|
||||||
E_CONFIGURE_OPTION_HELP(co, _("This option causes Quickaccess windows to not show up in pagers"));
|
|
||||||
|
|
||||||
e_configure_option_category_tag_add(_("windows"), _("quickaccess"));
|
|
||||||
e_configure_option_category_tag_add(_("quickaccess"), _("quickaccess"));
|
|
||||||
e_configure_option_category_icon_set(_("quickaccess"), buf);
|
|
||||||
|
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -98,10 +78,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
e_configure_registry_item_del("launcher/quickaccess");
|
e_configure_registry_item_del("launcher/quickaccess");
|
||||||
e_configure_registry_category_del("launcher");
|
e_configure_registry_category_del("launcher");
|
||||||
|
|
||||||
e_configure_option_domain_clear("quickaccess");
|
|
||||||
e_configure_option_category_tag_del(_("quickaccess"), _("quickaccess"));
|
|
||||||
e_configure_option_category_tag_del(_("windows"), _("quickaccess"));
|
|
||||||
|
|
||||||
e_qa_config_free(qa_config);
|
e_qa_config_free(qa_config);
|
||||||
E_FREE(qa_mod);
|
E_FREE(qa_mod);
|
||||||
qa_config = NULL;
|
qa_config = NULL;
|
||||||
|
|
|
@ -113,7 +113,6 @@ EAPI void *
|
||||||
e_modapi_init(E_Module *m)
|
e_modapi_init(E_Module *m)
|
||||||
{
|
{
|
||||||
char buf[PATH_MAX];
|
char buf[PATH_MAX];
|
||||||
E_Configure_Option *co;
|
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "%s/e-module-teamwork.edj", e_module_dir_get(m));
|
snprintf(buf, sizeof(buf), "%s/e-module-teamwork.edj", e_module_dir_get(m));
|
||||||
e_configure_registry_category_add("applications", 20, _("Apps"), NULL,
|
e_configure_registry_category_add("applications", 20, _("Apps"), NULL,
|
||||||
|
@ -156,35 +155,6 @@ e_modapi_init(E_Module *m)
|
||||||
e_tw_toggle->func.go = e_tw_act_toggle_cb;
|
e_tw_toggle->func.go = e_tw_act_toggle_cb;
|
||||||
e_action_predef_name_set(_e_tw_name, _lbl_toggle, _act_toggle, NULL, NULL, 1);
|
e_action_predef_name_set(_e_tw_name, _lbl_toggle, _act_toggle, NULL, NULL, 1);
|
||||||
|
|
||||||
e_configure_option_domain_current_set("teamwork");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "teamwork-settings", _("Teamwork settings panel"), _("teamwork"), _("applications"));
|
|
||||||
co->info = eina_stringshare_add("applications/teamwork");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, buf);
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, disable_media_fetch, tw_config, _("Disable Teamwork remote media fetching"), _("teamwork"));
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, disable_video, tw_config, _("Disable Teamwork video popups"), _("teamwork"));
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, DOUBLE, allowed_media_size, tw_config, _("Maximum total size of Teamwork media to keep in RAM"), _("teamwork"), _("cache"));
|
|
||||||
E_CONFIGURE_OPTION_MINMAX_STEP_FMT(co, 0, 1024, 16, _("%4.0f MiB"));
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, DOUBLE, allowed_media_size, tw_config, _("Maximum size of remote media items to fetch with Teamwork"), _("teamwork"), _("cache"));
|
|
||||||
E_CONFIGURE_OPTION_MINMAX_STEP_FMT(co, 1, 50, 1, _("%2.0f MiB"));
|
|
||||||
E_CONFIGURE_OPTION_HELP(co, _("This option determines how much memory will be used to cache recent media for faster loading."));
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, DOUBLE, allowed_media_age, tw_config, _("Maximum age for a disk-cached Teamwork media item"), _("teamwork"), _("cache"));
|
|
||||||
E_CONFIGURE_OPTION_MINMAX_STEP_FMT(co, -1, 180, 1, _("%3.0f Days"));
|
|
||||||
E_CONFIGURE_OPTION_HELP(co, _("This option determines how long media will remain in the disk cache before it is pruned.</ps>"
|
|
||||||
"Set to -1 to never delete media, or to 0 to never cache media on disk."));
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, DOUBLE, mouse_out_delay, tw_config, _("Delay before closing a Teamwork popup on mouse-out"), _("teamwork"), _("mouse"));
|
|
||||||
E_CONFIGURE_OPTION_MINMAX_STEP_FMT(co, 0, 5, 0.5, _("%1.1f seconds"));
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, DOUBLE, popup_size, tw_config, _("Maximum percentage of screen to use for Teamwork popups"), _("teamwork"), _("screen"));
|
|
||||||
E_CONFIGURE_OPTION_MINMAX_STEP_FMT(co, 10, 100, 1, _("%3.0f"));
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, DOUBLE, popup_opacity, tw_config, _("Opacity to use for Teamwork popups"), _("teamwork"));
|
|
||||||
E_CONFIGURE_OPTION_MINMAX_STEP_FMT(co, 10, 100, 1, _("%3.0f"));
|
|
||||||
co->funcs[0].none = tw_popup_opacity_set;
|
|
||||||
|
|
||||||
e_configure_option_category_tag_add(_("applications"), _("teamwork"));
|
|
||||||
e_configure_option_category_tag_add(_("teamwork"), _("teamwork"));
|
|
||||||
e_configure_option_category_icon_set(_("teamwork"), buf);
|
|
||||||
|
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -200,10 +170,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
e_configure_registry_item_del("applications/teamwork");
|
e_configure_registry_item_del("applications/teamwork");
|
||||||
e_configure_registry_category_del("applications");
|
e_configure_registry_category_del("applications");
|
||||||
|
|
||||||
e_configure_option_domain_clear("teamwork");
|
|
||||||
e_configure_option_category_tag_del(_("teamwork"), _("teamwork"));
|
|
||||||
e_configure_option_category_tag_del(_("applications"), _("teamwork"));
|
|
||||||
|
|
||||||
e_action_predef_name_del(_e_tw_name, _lbl_toggle);
|
e_action_predef_name_del(_e_tw_name, _lbl_toggle);
|
||||||
e_action_del(_act_toggle);
|
e_action_del(_act_toggle);
|
||||||
e_tw_toggle = NULL;
|
e_tw_toggle = NULL;
|
||||||
|
|
|
@ -3908,29 +3908,6 @@ e_modapi_init(E_Module *m)
|
||||||
_G.currently_switching_desktop = 0;
|
_G.currently_switching_desktop = 0;
|
||||||
_G.action_cb = NULL;
|
_G.action_cb = NULL;
|
||||||
|
|
||||||
{
|
|
||||||
E_Configure_Option *co;
|
|
||||||
|
|
||||||
e_configure_option_domain_current_set("tiling");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "tiling", _("Tiling settings"), _("tiling"), _("border"));
|
|
||||||
co->info = eina_stringshare_add("windows/tiling");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, _G.edj_path);
|
|
||||||
co->funcs[0].one = co->funcs[0].none = e_tiling_update_conf;
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, tile_dialogs, tiling_g.config, _("Tile dialog windows"), _("dialog"), _("tiling"), _("border"), _("placement"));
|
|
||||||
co->funcs[0].one = co->funcs[0].none = e_tiling_update_conf;
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, BOOL, show_titles, tiling_g.config, _("Show window titles when tiling"), _("tiling"), _("border"));
|
|
||||||
co->funcs[0].one = co->funcs[0].none = e_tiling_update_conf;
|
|
||||||
E_CONFIGURE_OPTION_ADD(co, STR, keyhints, tiling_g.config, _("Tiling key hints"), _("key"), _("tiling"));
|
|
||||||
co->funcs[0].one = co->funcs[0].none = e_tiling_update_conf;
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, _G.edj_path);
|
|
||||||
|
|
||||||
e_configure_option_category_tag_add(_("windows"), _("tiling"));
|
|
||||||
e_configure_option_category_tag_add(_("tiling"), _("tiling"));
|
|
||||||
e_configure_option_category_icon_set(_("tiling"), _G.edj_path);
|
|
||||||
}
|
|
||||||
|
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4051,12 +4028,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
|
|
||||||
end_special_input();
|
end_special_input();
|
||||||
|
|
||||||
e_configure_option_domain_clear("tiling");
|
|
||||||
|
|
||||||
e_configure_option_category_icon_set(_("tiling"), _G.edj_path);
|
|
||||||
e_configure_option_category_tag_del(_("border"), _("tiling"));
|
|
||||||
e_configure_option_category_tag_del(_("tiling"), _("tiling"));
|
|
||||||
|
|
||||||
free(tiling_g.config->keyhints);
|
free(tiling_g.config->keyhints);
|
||||||
E_FREE(tiling_g.config);
|
E_FREE(tiling_g.config);
|
||||||
E_CONFIG_DD_FREE(_G.config_edd);
|
E_CONFIG_DD_FREE(_G.config_edd);
|
||||||
|
|
|
@ -75,16 +75,6 @@ e_modapi_init(E_Module *m)
|
||||||
"preferences-desktop-keyboard",
|
"preferences-desktop-keyboard",
|
||||||
_xkb_cfg_dialog);
|
_xkb_cfg_dialog);
|
||||||
|
|
||||||
{
|
|
||||||
E_Configure_Option *co;
|
|
||||||
|
|
||||||
e_configure_option_domain_current_set("xkbswitch");
|
|
||||||
|
|
||||||
E_CONFIGURE_OPTION_ADD_CUSTOM(co, "xkb layouts", _("Keyboard layout settings"), _("input"), _("key"), _("language"));
|
|
||||||
co->info = eina_stringshare_add("keyboard_and_mouse/xkbswitch");
|
|
||||||
E_CONFIGURE_OPTION_ICON(co, "preferences-desktop-keyboard");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
_xkb.module = m;
|
_xkb.module = m;
|
||||||
ecore_event_handler_add(ECORE_X_EVENT_XKB_STATE_NOTIFY, _xkb_changed_state, NULL);
|
ecore_event_handler_add(ECORE_X_EVENT_XKB_STATE_NOTIFY, _xkb_changed_state, NULL);
|
||||||
|
@ -103,8 +93,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
e_configure_registry_item_del("keyboard_and_mouse/xkbswitch");
|
e_configure_registry_item_del("keyboard_and_mouse/xkbswitch");
|
||||||
e_configure_registry_category_del("keyboard_and_mouse");
|
e_configure_registry_category_del("keyboard_and_mouse");
|
||||||
|
|
||||||
e_configure_option_domain_clear("xkbswitch");
|
|
||||||
|
|
||||||
if (_xkb.evh) ecore_event_handler_del(_xkb.evh);
|
if (_xkb.evh) ecore_event_handler_del(_xkb.evh);
|
||||||
if (_xkb.cfd) e_object_del(E_OBJECT(_xkb.cfd));
|
if (_xkb.cfd) e_object_del(E_OBJECT(_xkb.cfd));
|
||||||
_xkb.cfd = NULL;
|
_xkb.cfd = NULL;
|
||||||
|
|