From f9065df7380058222d1ad7d7b617b8d7ba74ac0d Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Sat, 4 Aug 2007 00:20:54 +0000 Subject: [PATCH] Remove the Add Application menu item if the conf-apps module is not loaded. Disable the "Configure" button in the config dialog is conf-apps module is not loaded. SVN revision: 31152 --- src/modules/ibar/e_mod_config.c | 5 ++++- src/modules/ibar/e_mod_main.c | 13 ++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c index c79a3d6c1..977a43630 100644 --- a/src/modules/ibar/e_mod_config.c +++ b/src/modules/ibar/e_mod_config.c @@ -111,7 +111,10 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf ob = e_widget_button_add(evas, _("Delete"), "widget/del", _cb_del, cfdata, NULL); e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 1, 1, 0); ob = e_widget_button_add(evas, _("Configure"), "widget/config", _cb_config, cfdata, NULL); - e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 1, 1, 0); + e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 1, 1, 0); + + if (!e_configure_registry_exists("applications/ibar_applications")) + e_widget_disabled_set(ob, 1); e_widget_frametable_object_append(of, ot, 1, 0, 1, 1, 1, 1, 1, 0); e_widget_list_object_append(o, of, 1, 1, 0.5); diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index b2a1364ef..3f773c330 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -776,11 +776,14 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration"); e_menu_item_callback_set(mi, _ibar_cb_menu_configuration, ic->ibar); - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Add Application")); - e_util_menu_item_edje_icon_set(mi, "enlightenment/add"); - e_menu_item_callback_set(mi, _ibar_cb_menu_add, ic->ibar); - + if (e_configure_registry_exists("applications/ibar_applications")) + { + mi = e_menu_item_new(mn); + e_menu_item_label_set(mi, _("Add Application")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/add"); + e_menu_item_callback_set(mi, _ibar_cb_menu_add, ic->ibar); + } + e_gadcon_client_util_menu_items_append(ic->ibar->inst->gcc, mn, 0); e_gadcon_canvas_zone_geometry_get(ic->ibar->inst->gcc->gadcon,