Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c e_shelf.c
Log Message:
remove icon path - really useless info you probably shouldnt change anyway as
this will confuse things.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_eap_editor.c 14 May 2006 01:13:42 -0000 1.25
+++ e_eap_editor.c 14 May 2006 02:38:14 -0000 1.26
@@ -27,7 +27,6 @@
char *wtitle;
char *wrole;
char *iclass;
- char *path;
int startup_notify;
int wait_exit;
/*- common -*/
@@ -103,7 +102,6 @@
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_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 @@
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 @@
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 @@
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 @@
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_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_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);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_shelf.c 10 May 2006 07:42:38 -0000 1.20
+++ e_shelf.c 14 May 2006 02:38:14 -0000 1.21
@@ -735,6 +735,15 @@
}
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)
{
E_Shelf *es;
@@ -764,7 +773,7 @@
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);
@@ -780,6 +789,11 @@
e_menu_item_label_set(mi, _("Configure Contents"));
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,
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
