Enlightenment CVS committal
Author : morlenxus
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c e_entry_dialog.c e_fm_prop.c
e_int_border_prop.c e_widget_csel.c e_widget_entry.c
e_widget_entry.h e_widget_fsel.c
Log Message:
API breakage: e_widget_entry_add() allows now to set a cb function for text
change events.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- e_eap_editor.c 19 Aug 2007 14:54:55 -0000 1.89
+++ e_eap_editor.c 7 Oct 2007 21:22:40 -0000 1.90
@@ -463,7 +463,7 @@
0, 0, 1, 1,
1, 1, 1, 1);
- entry = e_widget_entry_add(evas, &(cfdata->name));
+ entry = e_widget_entry_add(evas, &(cfdata->name), NULL, NULL, NULL);
e_widget_min_size_set(entry, 100, 1);
e_widget_frametable_object_append(o, entry,
1, 0, 1, 1,
@@ -471,7 +471,7 @@
e_widget_frametable_object_append(o, e_widget_label_add(evas,
_("Executable")),
0, 1, 1, 1,
1, 1, 1, 1);
- editor->entry_widget = e_widget_entry_add(evas, &(cfdata->exec));
+ editor->entry_widget = e_widget_entry_add(evas, &(cfdata->exec), NULL,
NULL, NULL);
e_widget_frametable_object_append(o, editor->entry_widget,
1, 1, 1, 1,
1, 1, 1, 1);
@@ -482,7 +482,7 @@
e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Comment")),
0, 2, 1, 1,
1, 1, 1, 1);
- e_widget_frametable_object_append(o, e_widget_entry_add(evas,
&(cfdata->comment)),
+ e_widget_frametable_object_append(o, e_widget_entry_add(evas,
&(cfdata->comment), NULL, NULL, NULL),
1, 2, 1, 1,
1, 1, 1, 1);
e_widget_table_object_append(ol, o, 1, 0, 1, 1, 1 ,1, 1, 1);
@@ -514,7 +514,7 @@
0, 0, 1, 1,
1, 1, 1, 1);
- entry = e_widget_entry_add(evas, &(cfdata->generic_name));
+ entry = e_widget_entry_add(evas, &(cfdata->generic_name), NULL, NULL, NULL);
e_widget_min_size_set(entry, 100, 1);
e_widget_frametable_object_append(o, entry,
1, 0, 1, 1,
@@ -523,14 +523,14 @@
0, 1, 1, 1,
1, 1, 1, 1);
- e_widget_frametable_object_append(o, e_widget_entry_add(evas,
&(cfdata->startup_wm_class)),
+ e_widget_frametable_object_append(o, e_widget_entry_add(evas,
&(cfdata->startup_wm_class), NULL, NULL, NULL),
1, 1, 1, 1,
1, 1, 1, 1);
e_widget_frametable_object_append(o, e_widget_label_add(evas,
_("Categories")),
0, 2, 1, 1,
1, 1, 1, 1);
- e_widget_frametable_object_append(o, e_widget_entry_add(evas,
&(cfdata->categories)),
+ e_widget_frametable_object_append(o, e_widget_entry_add(evas,
&(cfdata->categories), NULL, NULL, NULL),
1, 2, 1, 1,
1, 1, 1, 1);
@@ -552,7 +552,7 @@
o = e_widget_frametable_add(evas, _("Desktop file"), 0);
e_widget_frametable_object_append(o, e_widget_label_add(evas,
_("Filename")),
0, 0, 1, 1, 0, 0, 0, 0);
- fn = e_widget_entry_add(evas, &(cfdata->editor->desktop->orig_path));
+ fn = e_widget_entry_add(evas, &(cfdata->editor->desktop->orig_path), NULL,
NULL, NULL);
e_widget_frametable_object_append(o, fn, 1, 0, 2, 1, 1, 1, 1, 1);
e_widget_disabled_set(fn, 1);
e_widget_table_object_append(ol, o, 0, 2, 2, 1, 1 ,1, 1, 1);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry_dialog.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_entry_dialog.c 7 Oct 2006 17:04:34 -0000 1.9
+++ e_entry_dialog.c 7 Oct 2007 21:22:40 -0000 1.10
@@ -48,7 +48,7 @@
e_widget_list_object_append(o, ob, 1, 0, 0.5);
}
- ed->entry = e_widget_entry_add(dia->win->evas, &(ed->text));
+ ed->entry = e_widget_entry_add(dia->win->evas, &(ed->text), NULL, NULL,
NULL);
e_widget_list_object_append(o, ed->entry, 1, 1, 0.5);
e_widget_min_size_get(o, &w, &h);
e_dialog_content_set(dia, o, w, h);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_prop.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_fm_prop.c 29 May 2007 11:25:54 -0000 1.20
+++ e_fm_prop.c 7 Oct 2007 21:22:40 -0000 1.21
@@ -337,28 +337,28 @@
ob = e_widget_label_add(evas, _("File:"));
e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
- ob = e_widget_entry_add(evas, &(cfdata->file));
+ ob = e_widget_entry_add(evas, &(cfdata->file), NULL, NULL, NULL);
e_widget_min_size_set(ob, 140, -1);
e_widget_entry_readonly_set(ob, 1);
e_widget_table_object_append(ot, ob, 1, 0, 1, 1, 1, 0, 1, 0);
ob = e_widget_label_add(evas, _("Size:"));
e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 0, 1, 0);
- ob = e_widget_entry_add(evas, &(cfdata->size));
+ ob = e_widget_entry_add(evas, &(cfdata->size), NULL, NULL, NULL);
e_widget_min_size_set(ob, 140, -1);
e_widget_entry_readonly_set(ob, 1);
e_widget_table_object_append(ot, ob, 1, 1, 1, 1, 1, 0, 1, 0);
ob = e_widget_label_add(evas, _("Last Modified:"));
e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 0, 1, 0);
- ob = e_widget_entry_add(evas, &(cfdata->mod_date));
+ ob = e_widget_entry_add(evas, &(cfdata->mod_date), NULL, NULL, NULL);
e_widget_min_size_set(ob, 140, -1);
e_widget_entry_readonly_set(ob, 1);
e_widget_table_object_append(ot, ob, 1, 2, 1, 1, 1, 0, 1, 0);
ob = e_widget_label_add(evas, _("File Type:"));
e_widget_table_object_append(ot, ob, 0, 3, 1, 1, 1, 0, 1, 0);
- ob = e_widget_entry_add(evas, &(cfdata->mime));
+ ob = e_widget_entry_add(evas, &(cfdata->mime), NULL, NULL, NULL);
e_widget_min_size_set(ob, 140, -1);
e_widget_entry_readonly_set(ob, 1);
e_widget_table_object_append(ot, ob, 1, 3, 1, 1, 1, 0, 1, 0);
@@ -366,7 +366,7 @@
of = e_widget_frametable_add(evas, _("Permissions"), 0);
ob = e_widget_label_add(evas, _("Owner:"));
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
- ob = e_widget_entry_add(evas, &(cfdata->owner));
+ ob = e_widget_entry_add(evas, &(cfdata->owner), NULL, NULL, NULL);
e_widget_min_size_set(ob, 60, -1);
e_widget_entry_readonly_set(ob, 1);
e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
@@ -455,7 +455,7 @@
{
ot = e_widget_frametable_add(evas, _("Link Information"), 0);
- ob = e_widget_entry_add(evas, &(cfdata->link));
+ ob = e_widget_entry_add(evas, &(cfdata->link), NULL, NULL, NULL);
e_widget_frametable_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
e_widget_table_object_append(o, ot, 1, 1, 1, 1, 1, 1, 1, 1);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_prop.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_int_border_prop.c 13 Sep 2007 21:09:12 -0000 1.13
+++ e_int_border_prop.c 7 Oct 2007 21:22:40 -0000 1.14
@@ -384,7 +384,7 @@
ob = e_widget_label_add(evas, label); \
if (!cfdata->val) e_widget_disabled_set(ob, 1); \
e_widget_frametable_object_append(of, ob, x, y, 1, 1, 1, 1, 1, 1); \
- ob = e_widget_entry_add(evas, &(cfdata->val)); \
+ ob = e_widget_entry_add(evas, &(cfdata->val), NULL, NULL, NULL); \
if (!cfdata->val) e_widget_disabled_set(ob, 1); \
e_widget_entry_readonly_set(ob, 1); \
e_widget_min_size_get(ob, &mw, &mh); \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_csel.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_widget_csel.c 8 Apr 2007 21:00:30 -0000 1.11
+++ e_widget_csel.c 7 Oct 2007 21:22:40 -0000 1.12
@@ -242,7 +242,7 @@
e_widget_on_change_hook_set(o, _e_wid_cb_color_changed, wd);
e_widget_table_object_append(frame, o, 1, i, 1, 1, 1, 1, 1, 0);
- o = e_widget_entry_add(evas, &(wd->values[i]));
+ o = e_widget_entry_add(evas, &(wd->values[i]), NULL, NULL, NULL);
e_widget_sub_object_add(obj, o);
evas_object_show(o);
wd->entries = evas_list_append(wd->entries, o);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_entry.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_widget_entry.c 14 Aug 2007 21:07:10 -0000 1.20
+++ e_widget_entry.c 7 Oct 2007 21:22:40 -0000 1.21
@@ -8,6 +8,9 @@
{
Evas_Object *o_entry;
char **text_location;
+ void (*func) (void *data, void *data2);
+ void *data;
+ void *data2;
};
/* local subsystem functions */
@@ -30,9 +33,9 @@
* The current value will be used to initialize the entry
* @return Returns the new entry widget
*/
-EAPI Evas_Object *
-e_widget_entry_add(Evas *evas, char **text_location)
-{
+EAPI Evas_Object
+*e_widget_entry_add(Evas *evas, char **text_location, void (*func) (void
*data, void *data2), void *data, void *data2)
+{
Evas_Object *obj, *o;
E_Widget_Data *wd;
Evas_Coord minw, minh;
@@ -63,6 +66,9 @@
e_entry_min_size_get(o, &minw, &minh);
e_widget_min_size_set(obj, minw, minh);
+ wd->func = func;
+ wd->data = data;
+ wd->data2 = data2;
evas_object_smart_callback_add(o, "changed", _e_wid_changed_cb, obj);
return obj;
@@ -252,8 +258,9 @@
free(*wd->text_location);
*wd->text_location = text ? strdup(text) : NULL;
}
-
e_widget_change(data);
+
+ if (wd->func) wd->func(wd->data, wd->data2);
}
static void
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_entry.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_widget_entry.h 10 Jan 2007 16:32:29 -0000 1.8
+++ e_widget_entry.h 7 Oct 2007 21:22:40 -0000 1.9
@@ -6,7 +6,7 @@
#ifndef E_WIDGET_ENTRY_H
#define E_WIDGET_ENTRY_H
-EAPI Evas_Object *e_widget_entry_add (Evas *evas, char
**text_location);
+EAPI Evas_Object *e_widget_entry_add (Evas *evas, char
**text_location, void (*func) (void *data, void *data2), void *data, void
*data2);
EAPI void e_widget_entry_text_set (Evas_Object *entry,
const char *text);
EAPI const char *e_widget_entry_text_get (Evas_Object *entry);
EAPI void e_widget_entry_clear (Evas_Object *entry);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- e_widget_fsel.c 25 Jul 2007 17:00:50 -0000 1.54
+++ e_widget_fsel.c 7 Oct 2007 21:22:40 -0000 1.55
@@ -327,7 +327,7 @@
wd->o_preview_size,
0, 0, 1, 1, 1, 1, 1, 1);
- o = e_widget_entry_add(evas, &(wd->preview_size_text));
+ o = e_widget_entry_add(evas, &(wd->preview_size_text), NULL, NULL,
NULL);
e_widget_entry_readonly_set(o, 1);
wd->o_preview_size_entry = o;
e_widget_sub_object_add(obj, o);
@@ -343,7 +343,7 @@
wd->o_preview_owner,
0, 1, 1, 1, 1, 1, 1, 1);
- o = e_widget_entry_add(evas, &(wd->preview_owner_text));
+ o = e_widget_entry_add(evas, &(wd->preview_owner_text), NULL, NULL,
NULL);
e_widget_entry_readonly_set(o, 1);
wd->o_preview_owner_entry = o;
e_widget_sub_object_add(obj, o);
@@ -359,7 +359,7 @@
wd->o_preview_perms,
0, 2, 1, 1, 1, 1, 1, 1);
- o = e_widget_entry_add(evas, &(wd->preview_perms_text));
+ o = e_widget_entry_add(evas, &(wd->preview_perms_text), NULL, NULL,
NULL);
e_widget_entry_readonly_set(o, 1);
wd->o_preview_perms_entry = o;
e_widget_sub_object_add(obj, o);
@@ -375,7 +375,7 @@
wd->o_preview_time,
0, 3, 1, 1, 1, 1, 1, 1);
- o = e_widget_entry_add(evas, &(wd->preview_time_text));
+ o = e_widget_entry_add(evas, &(wd->preview_time_text), NULL, NULL,
NULL);
e_widget_entry_readonly_set(o, 1);
wd->o_preview_time_entry = o;
e_widget_sub_object_add(obj, o);
@@ -469,7 +469,7 @@
e_widget_min_size_set(o, 128, 128);
e_widget_table_object_append(wd->o_table2, o, 1, 1, 1, 1, 1, 1, 1, 1);
- o = e_widget_entry_add(evas, &(wd->entry_text));
+ o = e_widget_entry_add(evas, &(wd->entry_text), NULL, NULL, NULL);
wd->o_entry = o;
e_widget_sub_object_add(obj, o);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
