vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove performance - engine cfg dialog as its obsolete 

this dialog had a singl option in it - use shaped windows... and we
don't even use it anymore. remove the dialog to avoid confusion and
set use shaeped window to 0 - maybe config val could go entirely?
This commit is contained in:
Carsten Haitzler 2014-08-11 10:56:35 +09:00
parent 8293711fc6
commit 3eb8330144
4 changed files with 3 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/e_config.c
View File

@ -1508,6 +1508,9 @@ e_config_load(void)
/* FIXME: disabled auto apply because it causes problems */
e_config->cfgdlg_auto_apply = 0;
// this is obsolete so 0 it out.
e_config->use_shaped_win = 0;
ecore_event_add(E_EVENT_CONFIG_LOADED, NULL, NULL, NULL);
}

1
src/modules/Makefile_conf_performance.mk
View File

@ -15,7 +15,6 @@ src_modules_conf_performance_module_la_LDFLAGS = $(MOD_LDFLAGS)
src_modules_conf_performance_module_la_SOURCES = src/modules/conf_performance/e_mod_main.c \
src/modules/conf_performance/e_mod_main.h \
src/modules/conf_performance/e_int_config_performance.c \
src/modules/conf_performance/e_int_config_engine.c \
src/modules/conf_performance/e_int_config_powermanagement.c
PHONIES += conf_performance install-conf_performance

139
src/modules/conf_performance/e_int_config_engine.c
View File

@ -1,139 +0,0 @@
#include "e.h"
static void *_create_data(E_Config_Dialog *cfd);
static void _fill_data(E_Config_Dialog_Data *cfdata);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static void _cb_shaped_change(void *data, Evas_Object *obj);
static void _cb_confirm_yes(void *data);
static void _cb_confirm_no(void *data);
struct _E_Config_Dialog_Data
{
E_Config_Dialog *cfd;
int use_shaped_win;
Evas_Object *o_shaped;
};
E_Config_Dialog *
e_int_config_engine(E_Comp *comp, const char *params __UNUSED__)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "advanced/engine")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
if (!v) return NULL;
v->create_cfdata = _create_data;
v->free_cfdata = _free_data;
v->basic.apply_cfdata = _basic_apply_data;
v->basic.create_widgets = _basic_create_widgets;
v->basic.check_changed = _basic_check_changed;
cfd = e_config_dialog_new(comp, _("Engine Settings"), "E", "advanced/engine",
"preferences-engine", 0, v, NULL);
return cfd;
}
static void *
_create_data(E_Config_Dialog *cfd)
{
E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
_fill_data(cfdata);
cfdata->cfd = cfd;
return cfdata;
}
static void
_fill_data(E_Config_Dialog_Data *cfdata)
{
cfdata->use_shaped_win = e_config->use_shaped_win;
}
static void
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
E_FREE(cfdata);
}
static int
_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
e_config->use_shaped_win = cfdata->use_shaped_win;
e_config_save_queue();
return 1;
}
static int
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
return !(cfdata->use_shaped_win == e_config->use_shaped_win);
}
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ob, *of;
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("General Settings"), 0);
ob = e_widget_check_add(evas, _("Use shaped windows instead of ARGB"),
&(cfdata->use_shaped_win));
cfdata->o_shaped = ob;
e_widget_on_change_hook_set(ob, _cb_shaped_change, cfdata);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 0, 0.5);
return o;
}
static void
_cb_shaped_change(void *data, Evas_Object *obj __UNUSED__)
{
E_Config_Dialog_Data *cfdata = NULL;
if (!(cfdata = data)) return;
if (cfdata->use_shaped_win)
{
/* pop dialog */
e_confirm_dialog_show(_("Use shaped windows instead of ARGB"),
"preferences-engine",
_("You have chosen to use shaped windows<br>"
"but your current screen is composited."
"<br><br>"
"Are you really sure you wish to use<br>"
"shaped windows?"),
NULL, NULL, _cb_confirm_yes,
_cb_confirm_no, cfdata, cfdata, NULL, NULL);
}
}
static void
_cb_confirm_yes(void *data)
{
E_Config_Dialog_Data *cfdata = NULL;
if (!(cfdata = data)) return;
cfdata->use_shaped_win = 1;
e_config_dialog_changed_set(cfdata->cfd, _basic_check_changed(cfdata->cfd, cfdata));
}
static void
_cb_confirm_no(void *data)
{
E_Config_Dialog_Data *cfdata = NULL;
if (!(cfdata = data)) return;
cfdata->use_shaped_win = 0;
e_widget_check_checked_set(cfdata->o_shaped, 0);
e_config_dialog_changed_set(cfdata->cfd, _basic_check_changed(cfdata->cfd, cfdata));
}

3
src/modules/conf_performance/e_mod_main.c
View File

@ -16,7 +16,6 @@ e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced");
e_configure_registry_item_add("advanced/performance", 20, _("Performance"), NULL, "preferences-system-performance", e_int_config_performance);
e_configure_registry_item_add("advanced/engine", 50, _("Engine"), NULL, "preferences-engine", e_int_config_engine);
e_configure_registry_item_add("advanced/powermanagement", 50, _("Power Management"), NULL, "preferences-system-power-management", e_int_config_powermanagement);
conf_module = m;
e_module_delayed_set(m, 1);
@ -27,9 +26,7 @@ EAPI int
e_modapi_shutdown(E_Module *m __UNUSED__)
{
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "advanced/engine"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "advanced/performance"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("advanced/engine");
e_configure_registry_item_del("advanced/performance");
e_configure_registry_item_del("advanced/powermanagement");
e_configure_registry_category_del("advanced");