enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

whitespaces-- 

SVN revision: 71390
This commit is contained in:
Vincent Torri 2012-05-24 05:49:08 +00:00
parent 61cac71776
commit 1aeae0786f
1 changed files with 125 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

250
src/modules/xkbswitch/e_mod_config.c
View File

@ -10,13 +10,13 @@ struct _E_Config_Dialog_Data
Evas_Object *btn_add, *btn_del, *btn_up, *btn_down;
Ecore_Timer *fill_delay;
Ecore_Timer *dlg_fill_delay;
Eina_List *cfg_layouts;
Eina_List *cfg_options;
const char *default_model;
int only_label;
E_Dialog *dlg_add_new;
};
@ -60,17 +60,17 @@ _xkb_cfg_dialog(E_Container *con, const char *params __UNUSED__)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "keyboard_and_mouse/xkbswitch"))
return NULL;
if (!(v = E_NEW(E_Config_Dialog_View, 1))) return NULL;
v->create_cfdata = _create_data;
v->free_cfdata = _free_data;
v->basic.create_widgets = _basic_create;
v->basic.apply_cfdata = _basic_apply;
cfd = e_config_dialog_new(con, _("XKB Switcher Module"), "E",
cfd = e_config_dialog_new(con, _("XKB Switcher Module"), "E",
"keyboard_and_mouse/xkbswitch",
"preferences-desktop-locale",
0, v, NULL);
@ -93,9 +93,9 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
find_rules();
parse_rules(); /* XXX: handle in case nothing was found? */
cfdata = E_NEW(E_Config_Dialog_Data, 1);
cfdata->cfg_layouts = NULL;
EINA_LIST_FOREACH(e_config->xkb.used_layouts, l, cl)
{
@ -103,15 +103,15 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
nl->name = eina_stringshare_add(cl->name);
nl->model = eina_stringshare_add(cl->model);
nl->variant = eina_stringshare_add(cl->variant);
cfdata->cfg_layouts = eina_list_append(cfdata->cfg_layouts, nl);
}
/* Initialize options */
cfdata->only_label = e_config->xkb.only_label;
cfdata->cfg_options = NULL;
lll = e_config->xkb.used_options;
EINA_LIST_FOREACH(optgroups, l, gr)
{
@ -119,7 +119,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
{
od = E_NEW(E_XKB_Dialog_Option, 1);
od->name = eina_stringshare_add(op->name);
if (lll &&
if (lll &&
(od->name == ((E_Config_XKB_Option *)
eina_list_data_get(lll))->name))
{
@ -130,7 +130,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
cfdata->cfg_options = eina_list_append(cfdata->cfg_options, od);
}
}
return cfdata;
}
@ -139,9 +139,9 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
E_Config_XKB_Layout *cl;
E_XKB_Dialog_Option *od;
_xkb.cfd = NULL;
EINA_LIST_FREE(cfdata->cfg_layouts, cl)
{
eina_stringshare_del(cl->name);
@ -149,13 +149,13 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
eina_stringshare_del(cl->variant);
E_FREE(cl);
}
EINA_LIST_FREE(cfdata->cfg_options, od)
{
eina_stringshare_del(od->name);
E_FREE(od);
}
eina_stringshare_del(cfdata->default_model);
E_FREE(cfdata);
clear_rules();
@ -168,7 +168,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
E_Config_XKB_Layout *cl, *nl;
E_Config_XKB_Option *oc;
E_XKB_Dialog_Option *od;
EINA_LIST_FREE(e_config->xkb.used_layouts, cl)
{
eina_stringshare_del(cl->name);
@ -176,44 +176,44 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
eina_stringshare_del(cl->variant);
E_FREE(cl);
}
EINA_LIST_FOREACH(cfdata->cfg_layouts, l, cl)
{
nl = E_NEW(E_Config_XKB_Layout, 1);
nl->name = eina_stringshare_add(cl->name);
nl->model = eina_stringshare_add(cl->model);
nl->variant = eina_stringshare_add(cl->variant);
e_config->xkb.used_layouts =
eina_list_append(e_config->xkb.used_layouts, nl);
}
if (e_config->xkb.default_model)
eina_stringshare_del(e_config->xkb.default_model);
e_config->xkb.default_model = eina_stringshare_add(cfdata->default_model);
/* Save options */
e_config->xkb.only_label = cfdata->only_label;
EINA_LIST_FREE(e_config->xkb.used_options, oc)
{
eina_stringshare_del(oc->name);
E_FREE(oc);
}
EINA_LIST_FOREACH(cfdata->cfg_options, l, od)
{
if (!od->enabled) continue;
oc = E_NEW(E_Config_XKB_Option, 1);
oc->name = eina_stringshare_add(od->name);
e_config->xkb.used_options = eina_list_append(e_config->xkb.used_options, oc);
}
e_xkb_update();
_xkb_update_icon();
e_config_save_queue();
return 1;
}
@ -232,11 +232,11 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
{
e_widget_size_min_set(configs, 220, 160);
e_widget_ilist_go(configs);
e_widget_list_object_append(layoutss, configs, 1, 1, 0.5);
cfdata->used_list = configs;
}
/* Holds the buttons */
Evas_Object *buttons = e_widget_table_add(evas, 1);
{
@ -245,39 +245,39 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
e_widget_disabled_set(cfdata->btn_up, EINA_TRUE);
e_widget_table_object_append(buttons, cfdata->btn_up, 0, 0, 1, 1, 1, 1, 1, 0);
}
cfdata->btn_down = e_widget_button_add(evas, _("Down"), "go-down", _cb_dn, cfdata, NULL);
{
e_widget_disabled_set(cfdata->btn_down, EINA_TRUE);
e_widget_table_object_append(buttons, cfdata->btn_down, 1, 0, 1, 1, 1, 1, 1, 0);
}
cfdata->btn_add = e_widget_button_add(evas, _("Add"), "list-add", _cb_add, cfdata, NULL);
{
e_widget_table_object_append(buttons, cfdata->btn_add, 0, 1, 1, 1, 1, 1, 1, 0);
}
cfdata->btn_del = e_widget_button_add(evas, _("Remove"), "list-remove", _cb_del, cfdata, NULL);
{
e_widget_disabled_set(cfdata->btn_del, EINA_TRUE);
e_widget_table_object_append(buttons, cfdata->btn_del, 1, 1, 1, 1, 1, 1, 1, 0);
}
e_widget_list_object_append(layoutss, buttons, 1, 0, 1);
}
e_widget_toolbook_page_append(mainn, NULL, _("Configurations"), layoutss, 1, 1, 1, 1, 0.5, 0.0);
}
/* Holds the default models */
Evas_Object *modelss = e_widget_ilist_add(evas, 32, 32, &cfdata->default_model);
{
e_widget_size_min_set(modelss, 220, 160);
cfdata->dmodel_list = modelss;
e_widget_toolbook_page_append(mainn, NULL, _("Models"), modelss, 1, 1, 1, 1, 0.5, 0.0);
}
/* Holds the options */
Evas_Object *options = e_widget_list_add(evas, 0, 0);
{
@ -285,7 +285,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
E_XKB_Option_Group *group;
Eina_List *l, *ll, *lll;
Evas_Coord mw, mh;
Evas_Object *general = e_widget_framelist_add(evas, _("Gadgets"), 0);
{
Evas_Object *only_label = e_widget_check_add(evas, _("Label only"), &(cfdata->only_label));
@ -294,13 +294,13 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
}
e_widget_list_object_append(options, general, 1, 1, 0.0);
}
lll = cfdata->cfg_options;
EINA_LIST_FOREACH(optgroups, l, group)
{
Evas_Object *grp = e_widget_framelist_add(evas, group->description, 0);
EINA_LIST_FOREACH(group->options, ll, option)
{
Evas_Object *chk = e_widget_check_add(evas, option->description,
@ -311,34 +311,34 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
}
e_widget_list_object_append(options, grp, 1, 1, 0.0);
}
e_widget_size_min_get(options, &mw, &mh);
if (mw < 220) mw = 220;
if (mh < 160) mh = 160;
evas_object_resize(options, mw, mh);
Evas_Object *scroller = e_widget_scrollframe_simple_add(evas, options);
e_widget_size_min_set(scroller, 220, 160);
e_widget_toolbook_page_append(mainn, NULL, _("Options"), scroller, 1, 1, 1, 1, 0.5, 0.0);
}
/* Display the first page by default */
e_widget_toolbook_page_show(mainn, 0);
}
/* The main evas */
cfdata->evas = evas;
/* Clear up any previous timer */
if (cfdata->fill_delay)
ecore_timer_del(cfdata->fill_delay);
/* Trigger the fill */
cfdata->fill_delay = ecore_timer_add(0.2, _cb_fill_delay, cfdata);
return mainn;
}
@ -347,7 +347,7 @@ _cb_add(void *data, void *data2 __UNUSED__)
{
E_Config_Dialog_Data *cfdata;
if (!(cfdata = data)) return;
if (cfdata->dlg_add_new) e_win_raise(cfdata->dlg_add_new->win);
else cfdata->dlg_add_new = _dlg_add_new(cfdata);
}
@ -357,12 +357,12 @@ _cb_del(void *data, void *data2 __UNUSED__)
{
E_Config_Dialog_Data *cfdata;
int n = 0;
if (!(cfdata = data)) return;
if ((n = e_widget_ilist_selected_get(cfdata->used_list)) < 0) return;
cfdata->cfg_layouts = eina_list_remove_list(cfdata->cfg_layouts, eina_list_nth_list(cfdata->cfg_layouts, n));
/* Update the list */
evas_event_freeze(cfdata->evas);
edje_freeze();
@ -383,33 +383,33 @@ _cb_up(void *data, void *data2 __UNUSED__)
Eina_List *l;
const char *lbl;
int n;
if (!(cfdata = data)) return;
if ((n = e_widget_ilist_selected_get(cfdata->used_list)) < 0) return;
l = eina_list_nth_list(cfdata->cfg_layouts, n);
nddata = eina_list_data_get(eina_list_prev(l));
eina_list_data_set(eina_list_prev(l), eina_list_data_get(l));
eina_list_data_set(l, nddata);
/* Update the list */
evas_event_freeze(cfdata->evas);
edje_freeze();
e_widget_ilist_freeze(cfdata->used_list);
ic = e_icon_add(cfdata->evas);
e_icon_file_set(ic, e_icon_file_get(e_widget_ilist_nth_icon_get(cfdata->used_list, n)));
lbl = e_widget_ilist_nth_label_get(cfdata->used_list, n);
e_widget_ilist_prepend_relative_full(cfdata->used_list, ic, NULL, lbl, _cb_used_select, cfdata, NULL, (n - 1));
e_widget_ilist_remove_num(cfdata->used_list, n);
e_widget_ilist_go(cfdata->used_list);
e_widget_ilist_thaw(cfdata->used_list);
edje_thaw();
evas_event_thaw(cfdata->evas);
e_widget_ilist_selected_set(cfdata->used_list, (n - 1));
}
@ -422,33 +422,33 @@ _cb_dn(void *data, void *data2 __UNUSED__)
Eina_List *l;
const char *lbl;
int n;
if (!(cfdata = data)) return;
if ((n = e_widget_ilist_selected_get(cfdata->used_list)) < 0) return;
l = eina_list_nth_list(cfdata->cfg_layouts, n);
nddata = eina_list_data_get(eina_list_next(l));
eina_list_data_set(eina_list_next(l), eina_list_data_get(l));
eina_list_data_set(l, nddata);
/* Update the list */
evas_event_freeze(cfdata->evas);
edje_freeze();
e_widget_ilist_freeze(cfdata->used_list);
ic = e_icon_add(cfdata->evas);
e_icon_file_set(ic, e_icon_file_get(e_widget_ilist_nth_icon_get(cfdata->used_list, n)));
lbl = e_widget_ilist_nth_label_get(cfdata->used_list, n);
e_widget_ilist_append_relative_full(cfdata->used_list, ic, NULL, lbl, _cb_used_select, cfdata, NULL, n);
e_widget_ilist_remove_num(cfdata->used_list, n);
e_widget_ilist_go(cfdata->used_list);
e_widget_ilist_thaw(cfdata->used_list);
edje_thaw();
evas_event_thaw(cfdata->evas);
e_widget_ilist_selected_set(cfdata->used_list, (n + 1));
}
@ -458,17 +458,17 @@ _dlg_add_new(E_Config_Dialog_Data *cfdata)
E_Dialog *dlg;
Evas *evas;
Evas_Coord mw, mh;
if (!(dlg = e_dialog_new(_xkb.cfd->con, "E", "xkbswitch_config_add_dialog"))) return NULL;
dlg->data = cfdata;
e_object_del_attach_func_set(E_OBJECT(dlg), _dlg_add_cb_del);
e_win_centered_set(dlg->win, 1);
evas = e_win_evas_get(dlg->win);
e_dialog_title_set(dlg, _("Add New Configuration"));
/* The main toolbook, holds the lists and tabs */
Evas_Object *mainn = e_widget_toolbook_add(evas, 24, 24);
{
@ -480,7 +480,7 @@ _dlg_add_new(E_Config_Dialog_Data *cfdata)
e_widget_toolbook_page_append(mainn, NULL, _("Available"), available, 1, 1, 1, 1, 0.5, 0.0);
cfdata->layout_list = available;
}
/* Holds the available models */
Evas_Object *modelss = e_widget_ilist_add(evas, 32, 32, NULL);
{
@ -496,28 +496,28 @@ _dlg_add_new(E_Config_Dialog_Data *cfdata)
}
e_widget_toolbook_page_show(mainn, 0);
}
e_widget_size_min_get(mainn, &mw, &mh);
e_dialog_content_set(dlg, mainn, mw, mh);
cfdata->dlg_evas = evas;
/* Clear up any previous timer */
if (cfdata->dlg_fill_delay) ecore_timer_del(cfdata->dlg_fill_delay);
/* Trigger the fill */
cfdata->dlg_fill_delay = ecore_timer_add(0.2, _cb_dlg_fill_delay, cfdata);
/* Some buttons */
e_dialog_button_add(dlg, _("OK"), NULL, _dlg_add_cb_ok, cfdata);
e_dialog_button_add(dlg, _("Cancel"), NULL, _dlg_add_cb_cancel, cfdata);
e_dialog_button_disable_num_set(dlg, 0, 1);
e_dialog_button_disable_num_set(dlg, 1, 0);
e_dialog_resizable_set(dlg, 1);
e_dialog_show(dlg);
return dlg;
}
@ -531,36 +531,36 @@ _dlg_add_cb_ok(void *data __UNUSED__, E_Dialog *dlg)
const char *layout = e_widget_ilist_selected_value_get(cfdata->layout_list);
const char *model = e_widget_ilist_selected_value_get(cfdata->model_list);
const char *variant = e_widget_ilist_selected_value_get(cfdata->variant_list);
/* The new configuration */
cl = E_NEW(E_Config_XKB_Layout, 1);
cl->name = eina_stringshare_add(layout);
cl->model = eina_stringshare_add(model);
cl->variant = eina_stringshare_add(variant);
cfdata->cfg_layouts = eina_list_append(cfdata->cfg_layouts, cl);
/* Update the main list */
evas_event_freeze(cfdata->evas);
edje_freeze();
e_widget_ilist_freeze(cfdata->used_list);
{
Evas_Object *ic = e_icon_add(cfdata->evas);
const char *name = cl->name;
e_xkb_e_icon_flag_setup(ic, name);
snprintf(buf, sizeof(buf), "%s (%s, %s)",
cl->name, cl->model, cl->variant);
e_widget_ilist_append_full(cfdata->used_list, ic, NULL, buf,
_cb_used_select, cfdata, NULL);
}
e_widget_ilist_go (cfdata->used_list);
e_widget_ilist_thaw(cfdata->used_list);
edje_thaw();
evas_event_thaw(cfdata->evas);
cfdata->dlg_add_new = NULL;
e_object_unref(E_OBJECT(dlg));
}
@ -595,28 +595,28 @@ _cb_dlg_fill_delay(void *data)
/* Update the list of available layouts */
evas_event_freeze(cfdata->dlg_evas);
edje_freeze();
e_widget_ilist_freeze(cfdata->layout_list);
e_widget_ilist_clear (cfdata->layout_list);
EINA_LIST_FOREACH(layouts, l, layout)
{
Evas_Object *ic = e_icon_add(cfdata->dlg_evas);
const char *name = layout->name;
e_xkb_e_icon_flag_setup(ic, name);
snprintf(buf, sizeof(buf), "%s (%s)",
layout->description, layout->name);
e_widget_ilist_append_full(cfdata->layout_list, ic, NULL, buf,
_cb_layout_select, cfdata, layout->name);
}
e_widget_ilist_go (cfdata->layout_list);
e_widget_ilist_thaw(cfdata->layout_list);
edje_thaw();
evas_event_thaw(cfdata->dlg_evas);
cfdata->dlg_fill_delay = NULL;
return ECORE_CALLBACK_CANCEL;
}
@ -632,57 +632,57 @@ _cb_layout_select(void *data)
const char *label;
int n;
char buf[PATH_MAX];
if (!(cfdata = data)) return;
/* Find the right layout */
if ((n = e_widget_ilist_selected_get(cfdata->layout_list)) < 0)
return;
if (!(label = e_widget_ilist_nth_label_get(cfdata->layout_list, n)))
return;
if (!(layout = eina_list_search_unsorted
(layouts, layout_sort_by_name_cb,
e_widget_ilist_nth_value_get(cfdata->layout_list, n)
))) return;
/* Update the lists */
evas_event_freeze(cfdata->dlg_evas);
edje_freeze();
/* Models */
e_widget_ilist_freeze(cfdata->model_list);
e_widget_ilist_clear(cfdata->model_list);
EINA_LIST_FOREACH(models, l, model)
{
snprintf(buf, sizeof(buf), "%s (%s)", model->description, model->name);
e_widget_ilist_append(cfdata->model_list, NULL, buf, NULL, cfdata, model->name);
}
e_widget_ilist_go(cfdata->model_list);
e_widget_ilist_thaw(cfdata->model_list);
/* Variants */
e_widget_ilist_freeze(cfdata->variant_list);
e_widget_ilist_clear(cfdata->variant_list);
EINA_LIST_FOREACH(layout->variants, l, variant)
{
snprintf(buf, sizeof(buf), "%s (%s)", variant->name, variant->description);
e_widget_ilist_append(cfdata->variant_list, NULL, buf, NULL, cfdata, variant->name);
}
e_widget_ilist_go(cfdata->variant_list);
e_widget_ilist_thaw(cfdata->variant_list);
edje_thaw();
evas_event_thaw(cfdata->dlg_evas);
e_widget_ilist_selected_set(cfdata->model_list, 0);
e_widget_ilist_selected_set(cfdata->variant_list, 0);
e_dialog_button_disable_num_set(cfdata->dlg_add_new, 0, 0);
}
@ -695,16 +695,16 @@ _cb_fill_delay(void *data)
E_XKB_Model *model;
int n = 0;
char buf[PATH_MAX];
if (!(cfdata = data)) return ECORE_CALLBACK_RENEW;
/* Update the list of used layouts */
evas_event_freeze(cfdata->evas);
edje_freeze();
e_widget_ilist_freeze(cfdata->used_list);
e_widget_ilist_clear(cfdata->used_list);
EINA_LIST_FOREACH(cfdata->cfg_layouts, l, cl)
{
Evas_Object *ic = e_icon_add(cfdata->evas);
@ -716,13 +716,13 @@ _cb_fill_delay(void *data)
e_widget_ilist_append_full(cfdata->used_list, ic, NULL, buf,
_cb_used_select, cfdata, NULL);
}
e_widget_ilist_go(cfdata->used_list);
e_widget_ilist_thaw(cfdata->used_list);
e_widget_ilist_freeze(cfdata->dmodel_list);
e_widget_ilist_clear(cfdata->dmodel_list);
/* Update the global model list */
EINA_LIST_FOREACH(models, l, model)
{
@ -733,12 +733,12 @@ _cb_fill_delay(void *data)
e_widget_ilist_selected_set(cfdata->dmodel_list, n);
n++;
}
e_widget_ilist_go(cfdata->dmodel_list);
e_widget_ilist_thaw(cfdata->dmodel_list);
edje_thaw();
evas_event_thaw(cfdata->evas);
cfdata->fill_delay = NULL;
return ECORE_CALLBACK_CANCEL;
}
@ -748,13 +748,13 @@ _cb_used_select(void *data)
{
E_Config_Dialog_Data *cfdata;
int n, c;
if (!(cfdata = data)) return;
if ((n = e_widget_ilist_selected_get(cfdata->used_list)) < 0) return;
c = e_widget_ilist_count(cfdata->used_list);
e_widget_disabled_set(cfdata->btn_del, EINA_FALSE);
if (n == (c - 1))
{
e_widget_disabled_set(cfdata->btn_up, EINA_FALSE);