API breakage: e_widget_entry_add() allows now to set a cb function for text change events.

SVN revision: 32009
This commit is contained in:
Miculcy Brian 2007-10-07 21:26:48 +00:00
parent c8c2f55e4e
commit a7d1bfeaae
18 changed files with 49 additions and 42 deletions

View File

@ -463,7 +463,7 @@ _e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_
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_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_
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_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_
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 @@ _e_desktop_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Conf
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 @@ _e_desktop_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Conf
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 @@ _e_desktop_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Conf
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);

View File

@ -48,7 +48,7 @@ e_entry_dialog_show(const char *title, const char *icon, const char *text,
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);

View File

@ -337,28 +337,28 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
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 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
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 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
{
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);

View File

@ -384,7 +384,7 @@ _bd_go(void *data, void *data2)
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); \

View File

@ -242,7 +242,7 @@ e_widget_csel_add(Evas *evas, E_Color *color)
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);

View File

@ -8,6 +8,9 @@ struct _E_Widget_Data
{
Evas_Object *o_entry;
char **text_location;
void (*func) (void *data, void *data2);
void *data;
void *data2;
};
/* local subsystem functions */
@ -30,8 +33,8 @@ static void _e_wid_keydown(void *data, Evas *e, Evas_Object *obj, void *event_in
* 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;
@ -63,6 +66,9 @@ e_widget_entry_add(Evas *evas, char **text_location)
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 @@ _e_wid_changed_cb(void *data, Evas_Object *obj, void *event_info)
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

View File

@ -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);

View File

@ -327,7 +327,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
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 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
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 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
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 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
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_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
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);

View File

@ -149,7 +149,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
of = e_widget_frametable_add(evas, _("Desktop Name"), 0);
ob = e_widget_label_add(evas, _("Name:"));
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 0);
ob = e_widget_entry_add(evas, &(cfdata->name));
ob = e_widget_entry_add(evas, &(cfdata->name), NULL, NULL, NULL);
e_widget_frametable_object_append(of, ob, 1, 0, 2, 1, 1, 1, 1, 0);
e_widget_list_object_append(o, of, 1, 1, 0.5);

View File

@ -329,7 +329,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
ow = e_widget_check_add(evas, _("Use custom screenlock"),
&(cfdata->custom_lock));
e_widget_framelist_object_append(of, ow);
ow = e_widget_entry_add(evas, &(cfdata->custom_lock_cmd));
ow = e_widget_entry_add(evas, &(cfdata->custom_lock_cmd), NULL, NULL, NULL);
e_widget_framelist_object_append(of, ow);
e_widget_table_object_append(mt, of, 1, 2, 2, 1, 1, 1, 1, 1);

View File

@ -186,7 +186,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
of = e_widget_framelist_add(evas, _("Terminal Settings"), 0);
ob = e_widget_label_add(evas, _("Terminal Command (CTRL+RETURN to utilize)"));
e_widget_framelist_object_append(of, ob);
ob = e_widget_entry_add(evas, &(cfdata->term_cmd));
ob = e_widget_entry_add(evas, &(cfdata->term_cmd), NULL, NULL, NULL);
e_widget_framelist_object_append(of, ob);
e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1);

View File

@ -906,21 +906,21 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
o = e_widget_label_add(evas, _("Name"));
e_widget_frametable_object_append(ol, o, 0, 0, 1, 1, 1, 1, 0, 0);
o = e_widget_entry_add(evas, &(cfdata->imc.e_im_name));
o = e_widget_entry_add(evas, &(cfdata->imc.e_im_name), NULL, NULL, NULL);
e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata);
cfdata->gui.e_im_name = o;
e_widget_frametable_object_append(ol, o, 1, 0, 1, 1, 1, 1, 1, 0);
o = e_widget_label_add(evas, _("Execute Command"));
e_widget_frametable_object_append(ol, o, 0, 1, 1, 1, 1, 1, 0, 0);
o = e_widget_entry_add(evas, &(cfdata->imc.e_im_exec));
o = e_widget_entry_add(evas, &(cfdata->imc.e_im_exec), NULL, NULL, NULL);
e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata);
cfdata->gui.e_im_exec = o;
e_widget_frametable_object_append(ol, o, 1, 1, 1, 1, 1, 1, 1, 0);
o = e_widget_label_add(evas, _("Setup Command"));
e_widget_frametable_object_append(ol, o, 0, 2, 1, 1, 1, 1, 0, 0);
o = e_widget_entry_add(evas, &(cfdata->imc.e_im_setup_exec));
o = e_widget_entry_add(evas, &(cfdata->imc.e_im_setup_exec), NULL, NULL, NULL);
e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata);
cfdata->gui.e_im_setup_exec = o;
e_widget_frametable_object_append(ol, o, 1, 2, 1, 1, 1, 1, 1, 0);
@ -932,21 +932,21 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
o = e_widget_label_add(evas, "GTK_IM_MODULE");
e_widget_frametable_object_append(ol, o, 0, 0, 1, 1, 1, 1, 0, 0);
o = e_widget_entry_add(evas, &(cfdata->imc.gtk_im_module));
o = e_widget_entry_add(evas, &(cfdata->imc.gtk_im_module), NULL, NULL, NULL);
e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata);
cfdata->gui.gtk_im_module = o;
e_widget_frametable_object_append(ol, o, 1, 0, 1, 1, 1, 1, 1, 0);
o = e_widget_label_add(evas, "QT_IM_MODULE");
e_widget_frametable_object_append(ol, o, 0, 1, 1, 1, 1, 1, 0, 0);
o = e_widget_entry_add(evas, &(cfdata->imc.qt_im_module));
o = e_widget_entry_add(evas, &(cfdata->imc.qt_im_module), NULL, NULL, NULL);
e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata);
cfdata->gui.qt_im_module = o;
e_widget_frametable_object_append(ol, o, 1, 1, 1, 1, 1, 1, 1, 0);
o = e_widget_label_add(evas, "XMODIFIERS");
e_widget_frametable_object_append(ol, o, 0, 2, 1, 1, 1, 1, 0, 0);
o = e_widget_entry_add(evas, &(cfdata->imc.xmodifiers));
o = e_widget_entry_add(evas, &(cfdata->imc.xmodifiers), NULL, NULL, NULL);
e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata);
cfdata->gui.xmodifiers = o;
e_widget_frametable_object_append(ol, o, 1, 2, 1, 1, 1, 1, 1, 0);

View File

@ -942,7 +942,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
of = e_widget_frametable_add(evas, _("Locale Selected"), 0);
ob = e_widget_label_add(evas, _("Locale"));
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0);
ob = e_widget_entry_add(evas, &(cfdata->cur_language));
ob = e_widget_entry_add(evas, &(cfdata->cur_language), NULL, NULL, NULL);
cfdata->gui.locale_entry = ob;
e_widget_disabled_set(cfdata->gui.locale_entry, 1);
e_widget_min_size_set(cfdata->gui.locale_entry, 100, 25);
@ -1020,7 +1020,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
of = e_widget_frametable_add(evas, _("Locale Selected"), 0);
ob = e_widget_label_add(evas, _("Locale"));
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0);
ob = e_widget_entry_add(evas, &(cfdata->cur_language));
ob = e_widget_entry_add(evas, &(cfdata->cur_language), NULL, NULL, NULL);
cfdata->gui.locale_entry = ob;
e_widget_disabled_set(cfdata->gui.locale_entry, 1);
e_widget_min_size_set(cfdata->gui.locale_entry, 100, 25);

View File

@ -253,7 +253,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
of = e_widget_framelist_add(evas, _("Action Params"), 0);
ob = e_widget_entry_add(evas, &(cfdata->locals.params));
ob = e_widget_entry_add(evas, &(cfdata->locals.params), NULL, NULL, NULL);
cfdata->gui.o_params = ob;
e_widget_disabled_set(ob, 1);
e_widget_framelist_object_append(of, ob);

View File

@ -136,7 +136,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
of = e_widget_frametable_add(evas, _("Basic Info"), 0);
ob = e_widget_label_add(evas, _("Mime:"));
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
ob = e_widget_entry_add(evas, &(cfdata->mime));
ob = e_widget_entry_add(evas, &(cfdata->mime), NULL, NULL, NULL);
e_widget_entry_readonly_set(ob, 1);
e_widget_min_size_set(ob, 100, 1);
e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);

View File

@ -326,7 +326,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_table_object_append(ot, of, 0, 0, 3, 1, 1, 1, 1, 1);
of = e_widget_framelist_add(evas, _("Action Params"), 0);
ob = e_widget_entry_add(evas, &(cfdata->locals.params));
ob = e_widget_entry_add(evas, &(cfdata->locals.params), NULL, NULL, NULL);
e_widget_disabled_set(ob, 1);
cfdata->gui.o_params = ob;
e_widget_framelist_object_append(of, ob);

View File

@ -266,7 +266,7 @@ _dia_new_profile(E_Config_Dialog_Data *cfdata)
e_widget_table_object_append(ot, ob,
0, 0, 1, 1,
0, 1, 0, 0);
ob = e_widget_entry_add(evas, &(cfdata->new_profile));
ob = e_widget_entry_add(evas, &(cfdata->new_profile), NULL, NULL, NULL);
e_widget_min_size_set(ob, 100, 1);
e_widget_table_object_append(ot, ob,
1, 0, 1, 1,

View File

@ -129,7 +129,7 @@ e_int_config_wallpaper_gradient(E_Config_Dialog *parent)
evas_object_show(o);
e_widget_table_object_append(ott, o, 0, 2, 1, 1, 0, 1, 0, 1);
o = e_widget_entry_add(evas, &(cfdata->name));
o = e_widget_entry_add(evas, &(cfdata->name), NULL, NULL, NULL);
evas_object_show(o);
e_widget_table_object_append(ott, o, 1, 0, 1, 1, 1, 1, 1, 1);