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

added ECORE_IMF_MODULE env option

This commit is contained in:
Thanatermesis 2018-01-04 23:54:47 +00:00 committed by Andy Williams
parent 3d9044a9fc
commit 7ddfffcaba
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/conf_intl/e_int_config_imc.c
View File

@ -59,6 +59,7 @@ struct _E_Config_Dialog_Data
char *gtk_im_module; char *gtk_im_module;
char *qt_im_module; char *qt_im_module;
char *xmodifiers; char *xmodifiers;
char *ecore_imf_module;
} imc; } imc;
Eina_Hash *imc_change_map; Eina_Hash *imc_change_map;
@ -78,6 +79,7 @@ struct _E_Config_Dialog_Data
Evas_Object *gtk_im_module; Evas_Object *gtk_im_module;
Evas_Object *qt_im_module; Evas_Object *qt_im_module;
Evas_Object *xmodifiers; Evas_Object *xmodifiers;
Evas_Object *ecore_imf_module;
} gui; } gui;
Evas_Object *win_import; Evas_Object *win_import;
@ -169,6 +171,7 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
E_FREE(cfdata->imc.gtk_im_module); E_FREE(cfdata->imc.gtk_im_module);
E_FREE(cfdata->imc.qt_im_module); E_FREE(cfdata->imc.qt_im_module);
E_FREE(cfdata->imc.xmodifiers); E_FREE(cfdata->imc.xmodifiers);
E_FREE(cfdata->imc.ecore_imf_module);
E_FREE(cfdata); E_FREE(cfdata);
} }
@ -693,6 +696,7 @@ _e_imc_form_fill(E_Config_Dialog_Data *cfdata)
e_widget_entry_text_set(cfdata->gui.gtk_im_module, imc->gtk_im_module); e_widget_entry_text_set(cfdata->gui.gtk_im_module, imc->gtk_im_module);
e_widget_entry_text_set(cfdata->gui.qt_im_module, imc->qt_im_module); e_widget_entry_text_set(cfdata->gui.qt_im_module, imc->qt_im_module);
e_widget_entry_text_set(cfdata->gui.xmodifiers, imc->xmodifiers); e_widget_entry_text_set(cfdata->gui.xmodifiers, imc->xmodifiers);
e_widget_entry_text_set(cfdata->gui.ecore_imf_module, imc->ecore_imf_module);
e_widget_entry_readonly_set(cfdata->gui.e_im_name, cfdata->fmdir); e_widget_entry_readonly_set(cfdata->gui.e_im_name, cfdata->fmdir);
e_widget_entry_readonly_set(cfdata->gui.e_im_exec, cfdata->fmdir); e_widget_entry_readonly_set(cfdata->gui.e_im_exec, cfdata->fmdir);
@ -700,6 +704,7 @@ _e_imc_form_fill(E_Config_Dialog_Data *cfdata)
e_widget_entry_readonly_set(cfdata->gui.gtk_im_module, cfdata->fmdir); e_widget_entry_readonly_set(cfdata->gui.gtk_im_module, cfdata->fmdir);
e_widget_entry_readonly_set(cfdata->gui.qt_im_module, cfdata->fmdir); e_widget_entry_readonly_set(cfdata->gui.qt_im_module, cfdata->fmdir);
e_widget_entry_readonly_set(cfdata->gui.xmodifiers, cfdata->fmdir); e_widget_entry_readonly_set(cfdata->gui.xmodifiers, cfdata->fmdir);
e_widget_entry_readonly_set(cfdata->gui.ecore_imf_module, cfdata->fmdir);
if (imc_free) e_intl_input_method_config_free(imc); if (imc_free) e_intl_input_method_config_free(imc);
} }
e_widget_check_checked_set(cfdata->gui.imc_advanced_disable, 0); e_widget_check_checked_set(cfdata->gui.imc_advanced_disable, 0);
@ -726,6 +731,7 @@ _e_imc_change_enqueue(E_Config_Dialog_Data *cfdata)
imc_update->gtk_im_module = eina_stringshare_add(cfdata->imc.gtk_im_module); imc_update->gtk_im_module = eina_stringshare_add(cfdata->imc.gtk_im_module);
imc_update->qt_im_module = eina_stringshare_add(cfdata->imc.qt_im_module); imc_update->qt_im_module = eina_stringshare_add(cfdata->imc.qt_im_module);
imc_update->xmodifiers = eina_stringshare_add(cfdata->imc.xmodifiers); imc_update->xmodifiers = eina_stringshare_add(cfdata->imc.xmodifiers);
imc_update->ecore_imf_module = eina_stringshare_add(cfdata->imc.ecore_imf_module);
/* look for changes to this file and remove them */ /* look for changes to this file and remove them */
imc_update_old = eina_hash_find(cfdata->imc_change_map, cfdata->imc_current); imc_update_old = eina_hash_find(cfdata->imc_change_map, cfdata->imc_current);
@ -945,6 +951,14 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
cfdata->gui.xmodifiers = ow; cfdata->gui.xmodifiers = ow;
e_widget_frametable_object_append(of, ow, 1, 2, 1, 1, 1, 1, 1, 0); e_widget_frametable_object_append(of, ow, 1, 2, 1, 1, 1, 1, 1, 0);
ow = e_widget_label_add(evas, "ECORE_IMF_MODULE");
e_widget_frametable_object_append(of, ow, 0, 3, 1, 1, 1, 1, 0, 0);
ow = e_widget_entry_add(cfd->dia->win, &(cfdata->imc.ecore_imf_module), NULL, NULL, NULL);
e_widget_on_change_hook_set(ow, _e_imc_entry_change_cb, cfdata);
cfdata->gui.ecore_imf_module = ow;
e_widget_frametable_object_append(of, ow, 1, 3, 1, 1, 1, 1, 1, 0);
e_widget_table_object_append(ot, of, 0, 2, 3, 1, 1, 1, 1, 1); e_widget_table_object_append(ot, of, 0, 2, 3, 1, 1, 1, 1, 1);
ow = e_widget_button_add(evas, _("Setup Selected Input Method"), "configure", _e_imc_adv_setup_cb, cfdata, NULL); ow = e_widget_button_add(evas, _("Setup Selected Input Method"), "configure", _e_imc_adv_setup_cb, cfdata, NULL);