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

remove some X references in settings dialogs 

fix T3435
This commit is contained in:
Mike Blumenkrantz 2016-04-22 13:30:05 -04:00
parent dd07d01737
commit 93e47dda3a
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/modules/conf_applications/e_int_config_deskenv.c
View File

@ -141,15 +141,20 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
&(cfdata->exe_always_single_instance));
e_widget_framelist_object_append(fr, ob);
e_widget_list_object_append(o, fr, 1, 0, 0.0);
fr = e_widget_framelist_add(evas, _("X11 Basics"), 0);
ob = e_widget_check_add(evas, _("Load X Resources"),
&(cfdata->load_xrdb));
e_widget_framelist_object_append(fr, ob);
ob = e_widget_check_add(evas, _("Load X Modifier Map"),
&(cfdata->load_xmodmap));
e_widget_framelist_object_append(fr, ob);
e_widget_list_object_append(o, fr, 1, 0, 0.0);
#ifndef HAVE_WAYLAND_ONLY
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
{
fr = e_widget_framelist_add(evas, _("X11 Basics"), 0);
ob = e_widget_check_add(evas, _("Load X Resources"),
&(cfdata->load_xrdb));
e_widget_framelist_object_append(fr, ob);
ob = e_widget_check_add(evas, _("Load X Modifier Map"),
&(cfdata->load_xmodmap));
e_widget_framelist_object_append(fr, ob);
e_widget_list_object_append(o, fr, 1, 0, 0.0);
}
#endif
fr = e_widget_framelist_add(evas, _("Major Desktops"), 0);
ob = e_widget_check_add(evas, _("Start GNOME services on login"),

2
src/modules/conf_display/e_int_config_desklock.c
View File

@ -346,7 +346,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
/* Timers */
ol = e_widget_list_add(evas, 0, 0);
oc = e_widget_check_add(evas, _("Lock after X screensaver activates"),
oc = e_widget_check_add(evas, _("Lock after screensaver activates"),
&cfdata->screensaver_lock);
e_widget_disabled_set(oc, !cfdata->use_xscreensaver);
e_widget_list_object_append(ol, oc, 1, 1, 0.5);

4
src/modules/conf_interaction/e_int_config_mouse.c
View File

@ -155,11 +155,11 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
e_widget_framelist_object_append(of, ob);
e_widget_check_widget_disable_on_unchecked_add(oc, ob);
ob = e_widget_label_add(evas, _("Theme"));
ob = e_widget_label_add(evas, _("E Theme"));
e_widget_framelist_object_append(of, ob);
e_widget_check_widget_disable_on_unchecked_add(oc, ob);
ob = e_widget_radio_add(evas, _("X"), 0, rg);
ob = e_widget_radio_add(evas, _("Application"), 0, rg);
e_widget_on_change_hook_set(ob, _use_e_cursor_cb_change, cfdata);
e_widget_framelist_object_append(of, ob);
e_widget_check_widget_disable_on_unchecked_add(oc, ob);

2
src/modules/conf_theme/e_int_config_xsettings.c
View File

@ -482,9 +482,11 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
* e_widget_list_object_append(o, ow, 0, 0, 0.0); */
// >> advanced
#ifndef HAVE_WAYLAND_ONLY
oc = e_widget_check_add(evas, _("Enable X Application Settings"),
&(cfdata->enable_xsettings));
e_widget_list_object_append(ol, oc, 0, 0, 0.0);
#endif
e_widget_check_widget_disable_on_unchecked_add(oc, ilist);
e_widget_check_widget_disable_on_unchecked_add(oc, ow);
e_widget_toolbook_page_append(otb, NULL, _("GTK Applications"), ol,