summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-12-21 12:04:10 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-12-21 12:04:10 +0000
commit7c8e9642bdd4b769654dac2a731550a96718b600 (patch)
tree3855393ab9e94f2ab779bfbc8da624b15571ae71
parentde5a59c46986f1d8682638e4cb3a1e0111ad7d5f (diff)
sooooo translators will hate me for this but I had to change another string here since it was 100% wrong. sorry.
this commit disables all the other widgets in xsettings config if "enable xsettings" is not checked, since this is what the result of disabling xsettings will be SVN revision: 81542
-rw-r--r--src/modules/conf_theme/e_int_config_xsettings.c27
1 files changed, 22 insertions, 5 deletions
diff --git a/src/modules/conf_theme/e_int_config_xsettings.c b/src/modules/conf_theme/e_int_config_xsettings.c
index 6b13b7492..e9fbb4b29 100644
--- a/src/modules/conf_theme/e_int_config_xsettings.c
+++ b/src/modules/conf_theme/e_int_config_xsettings.c
@@ -24,8 +24,11 @@ struct _E_Config_Dialog_Data
24 struct 24 struct
25 { 25 {
26 Evas_Object *widget_list; 26 Evas_Object *widget_list;
27 Evas_Object *match_theme;
27 Evas_Object *icon_list; 28 Evas_Object *icon_list;
28 Evas_Object *icon_preview[4]; /* same size as _icon_previews */ 29 Evas_Object *icon_preview[4]; /* same size as _icon_previews */
30 Evas_Object *icon_enable_apps;
31 Evas_Object *icon_enable_enlightenment;
29 } gui; 32 } gui;
30 Ecore_Idler *fill_icon_themes_delayed; 33 Ecore_Idler *fill_icon_themes_delayed;
31}; 34};
@@ -61,6 +64,20 @@ e_int_config_xsettings(E_Container *con, const char *params __UNUSED__)
61 return cfd; 64 return cfd;
62} 65}
63 66
67static void
68_settings_changed(void *data, Evas_Object *obj EINA_UNUSED)
69{
70 E_Config_Dialog_Data *cfdata = data;
71 Eina_Bool disable;
72
73 disable = !cfdata->enable_xsettings;
74 e_widget_disabled_set(cfdata->gui.icon_enable_apps, disable);
75 e_widget_disabled_set(cfdata->gui.icon_enable_enlightenment, disable);
76 e_widget_disabled_set(cfdata->gui.match_theme, disable);
77 e_widget_disabled_set(cfdata->gui.widget_list, disable);
78 e_widget_disabled_set(cfdata->gui.icon_list, disable);
79}
80
64static void * 81static void *
65_create_data(E_Config_Dialog *cfd) 82_create_data(E_Config_Dialog *cfd)
66{ 83{
@@ -468,7 +485,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
468 * &(cfdata->match_e17_icon_theme)); 485 * &(cfdata->match_e17_icon_theme));
469 * e_widget_list_object_append(ol, ow, 0, 0, 0.0); */ 486 * e_widget_list_object_append(ol, ow, 0, 0, 0.0); */
470 487
471 ow = e_widget_check_add(evas, _("Match Enlightenment theme if possible"), 488 cfdata->gui.match_theme = ow = e_widget_check_add(evas, _("Match Enlightenment theme if possible"),
472 &(cfdata->match_e17_theme)); 489 &(cfdata->match_e17_theme));
473 e_widget_list_object_append(ol, ow, 0, 0, 0.0); 490 e_widget_list_object_append(ol, ow, 0, 0, 0.0);
474 491
@@ -477,9 +494,9 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
477 * e_widget_list_object_append(o, ow, 0, 0, 0.0); */ 494 * e_widget_list_object_append(o, ow, 0, 0, 0.0); */
478 495
479 // >> advanced 496 // >> advanced
480 ow = e_widget_check_add(evas, _("Enable Settings Daemon"), 497 ow = e_widget_check_add(evas, _("Enable X Application Settings"),
481 &(cfdata->enable_xsettings)); 498 &(cfdata->enable_xsettings));
482 /* e_widget_on_change_hook_set(ow, _settings_changed, cfdata); */ 499 e_widget_on_change_hook_set(ow, _settings_changed, cfdata);
483 e_widget_list_object_append(ol, ow, 0, 0, 0.0); 500 e_widget_list_object_append(ol, ow, 0, 0, 0.0);
484 e_widget_toolbook_page_append(otb, NULL, _("GTK Applications"), ol, 501 e_widget_toolbook_page_append(otb, NULL, _("GTK Applications"), ol,
485 1, 1, 1, 1, 0.5, 0.0); 502 1, 1, 1, 1, 0.5, 0.0);
@@ -512,11 +529,11 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
512 * e_widget_on_change_hook_set(ow, _icon_theme_changed, cfdata); 529 * e_widget_on_change_hook_set(ow, _icon_theme_changed, cfdata);
513 * e_widget_list_object_append(ol, ow, 0, 0, 0.0); */ 530 * e_widget_list_object_append(ol, ow, 0, 0, 0.0); */
514 531
515 ow = e_widget_check_add(evas, _("Enable icon theme for applications"), 532 cfdata->gui.icon_enable_apps = ow = e_widget_check_add(evas, _("Enable icon theme for applications"),
516 &(cfdata->match_e17_icon_theme)); 533 &(cfdata->match_e17_icon_theme));
517 e_widget_list_object_append(ol, ow, 0, 0, 0.0); 534 e_widget_list_object_append(ol, ow, 0, 0, 0.0);
518 535
519 ow = e_widget_check_add(evas, _("Enable icon theme for Enlightenment"), 536 cfdata->gui.icon_enable_enlightenment = ow = e_widget_check_add(evas, _("Enable icon theme for Enlightenment"),
520 &(cfdata->icon_overrides)); 537 &(cfdata->icon_overrides));
521 e_widget_list_object_append(ol, ow, 0, 0, 0.0); 538 e_widget_list_object_append(ol, ow, 0, 0, 0.0);
522 539