From 62034acf5a587bbfbf203e7e7c2ce69bb8466eda Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 14 May 2006 02:38:14 +0000 Subject: [PATCH] remove icon path - really useless info you probably shouldnt change anyway as this will confuse things. SVN revision: 22604 --- src/bin/e_eap_editor.c | 18 ++---------------- src/bin/e_shelf.c | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c index e63f23f45..af8a2b79c 100644 --- a/src/bin/e_eap_editor.c +++ b/src/bin/e_eap_editor.c @@ -27,7 +27,6 @@ struct _E_App_Edit_CFData char *wtitle; char *wrole; char *iclass; - char *path; int startup_notify; int wait_exit; /*- common -*/ @@ -103,7 +102,6 @@ _e_eap_edit_fill_data(E_App_Edit_CFData *cfdata) IFDUP(cfdata->editor->eap->win_title, cfdata->wtitle); IFDUP(cfdata->editor->eap->win_role, cfdata->wrole); IFDUP(cfdata->editor->eap->icon_class, cfdata->iclass); - IFDUP(cfdata->editor->eap->path, cfdata->path); cfdata->startup_notify = cfdata->editor->eap->startup_notify; cfdata->wait_exit = cfdata->editor->eap->wait_exit; } @@ -136,7 +134,6 @@ _e_eap_edit_free_data(E_Config_Dialog *cfd, void *data) E_FREE(cfdata->wtitle); E_FREE(cfdata->wrole); E_FREE(cfdata->iclass); - E_FREE(cfdata->path); E_FREE(cfdata->image); e_object_unref(E_OBJECT(cfdata->editor->eap)); E_FREE(cfdata->editor); @@ -154,8 +151,6 @@ _e_eap_edit_basic_apply_data(E_Config_Dialog *cfd, void *data) editor = cfdata->editor; eap = editor->eap; - if (!(cfdata->path)) return 0; - if (eap->name) evas_stringshare_del(eap->name); if (eap->exe) evas_stringshare_del(eap->exe); if (eap->image) evas_stringshare_del(eap->image); @@ -188,8 +183,6 @@ _e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data) editor = cfdata->editor; eap = editor->eap; - if (!(cfdata->path)) return 0; - if (eap->name) evas_stringshare_del(eap->name); if (eap->exe) evas_stringshare_del(eap->exe); if (eap->image) evas_stringshare_del(eap->image); @@ -201,7 +194,6 @@ _e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data) if (eap->win_title) evas_stringshare_del(eap->win_title); if (eap->win_role) evas_stringshare_del(eap->win_role); if (eap->icon_class) evas_stringshare_del(eap->icon_class); - if (eap->path) evas_stringshare_del(eap->path); if (cfdata->startup_notify) eap->startup_notify = 1; else eap->startup_notify = 0; @@ -219,7 +211,6 @@ _e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data) if (cfdata->wtitle) eap->win_title = evas_stringshare_add(cfdata->wtitle); if (cfdata->wrole) eap->win_role = evas_stringshare_add(cfdata->wrole); if (cfdata->iclass) eap->icon_class = evas_stringshare_add(cfdata->iclass); - if (cfdata->path) eap->path = evas_stringshare_add(cfdata->path); /* FIXME: hardcoded until the eap editor provides fields to change it */ eap->width = 128; @@ -364,7 +355,7 @@ _e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data e_widget_table_object_append(ol, o, 0, 2, 1, 1, 1 ,1, 1, 1); /*- icon info -*/ - o = e_widget_frametable_add(evas, _("File"), 0); + o = e_widget_frametable_add(evas, _("Icon Theme"), 0); e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Icon Class")), 0, 0, 1, 1, @@ -375,12 +366,7 @@ _e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data e_widget_frametable_object_append(o, entry, 1, 0, 1, 1, 1, 1, 1, 1); - e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Path")), - 0, 1, 1, 1, - 1, 1, 1, 1); - e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->path)), - 1, 1, 1, 1, - 1, 1, 1, 1); + e_widget_table_object_append(ol, o, 1, 1, 1, 1, 1 ,1, 1, 1); diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c index 8f8423f45..13d1584d6 100644 --- a/src/bin/e_shelf.c +++ b/src/bin/e_shelf.c @@ -734,6 +734,15 @@ _e_shelf_cb_menu_contents(void *data, E_Menu *m, E_Menu_Item *mi) e_int_gadcon_config(es->gadcon); } +static void +_e_shelf_cb_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi) +{ + E_Shelf *es; + + es = data; + e_object_del(E_OBJECT(es)); +} + static void _e_shelf_cb_menu_post(void *data, E_Menu *m) { @@ -764,7 +773,7 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_inf es->menu = mn; mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Configuration")); + e_menu_item_label_set(mi, _("Shelf Configuration")); e_util_menu_item_edje_icon_set(mi, "enlightenment/config"); e_menu_item_callback_set(mi, _e_shelf_cb_menu_config, es); @@ -781,6 +790,11 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_inf e_util_menu_item_edje_icon_set(mi, "enlightenment/config"); e_menu_item_callback_set(mi, _e_shelf_cb_menu_contents, es); + mi = e_menu_item_new(mn); + e_menu_item_label_set(mi, _("Delete this Shelf")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/delete"); + e_menu_item_callback_set(mi, _e_shelf_cb_menu_delete, es); + e_gadcon_canvas_zone_geometry_get(es->gadcon, &cx, &cy, &cw, &ch); e_menu_activate_mouse(mn, e_util_zone_current_get(e_manager_current_get()),