enlightenment
/
enlightenment
5
6
Fork 6
Code Issues 15 Pull Requests 2 Projects Releases Wiki Activity

e_entry -> elm_entry conversion

Browse Source 
another dice roll in the board game of enlightenment development. next, I will attempt to roll doubles to get out of jail.

 #teamborker

fix T1906
devs/bu5hm4n/econfigure2
Mike Blumenkrantz 8 years ago
parent 207a125904
commit c978a045e6
40 changed files with 122 additions and 1193 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      po/POTFILES.in
  2. 2
      src/bin/Makefile.mk
  3. 19
      src/bin/e_desktop_editor.c
  4. 1048
      src/bin/e_entry.c
  5. 22
      src/bin/e_entry.h
  6. 2
      src/bin/e_entry_dialog.c
  7. 2
      src/bin/e_fm.c
  8. 23
      src/bin/e_fm_prop.c
  9. 1
      src/bin/e_includes.h
  10. 2
      src/bin/e_int_client_prop.c
  11. 12
      src/bin/e_int_client_remember.c
  12. 8
      src/bin/e_int_config_comp_match.c
  13. 4
      src/bin/e_widget_config_list.c
  14. 2
      src/bin/e_widget_config_list.h
  15. 2
      src/bin/e_widget_csel.c
  16. 48
      src/bin/e_widget_entry.c
  17. 2
      src/bin/e_widget_entry.h
  18. 13
      src/bin/e_widget_filepreview.c
  19. 2
      src/bin/e_widget_fsel.c
  20. 2
      src/modules/conf_applications/e_int_config_defapps.c
  21. 4
      src/modules/conf_bindings/e_int_config_acpibindings.c
  22. 4
      src/modules/conf_bindings/e_int_config_edgebindings.c
  23. 4
      src/modules/conf_bindings/e_int_config_keybindings.c
  24. 4
      src/modules/conf_bindings/e_int_config_mousebindings.c
  25. 8
      src/modules/conf_bindings/e_int_config_signalbindings.c
  26. 6
      src/modules/conf_display/e_int_config_desk.c
  27. 8
      src/modules/conf_display/e_int_config_desklock.c
  28. 14
      src/modules/conf_intl/e_int_config_imc.c
  29. 8
      src/modules/conf_intl/e_int_config_intl.c
  30. 6
      src/modules/conf_paths/e_int_config_env.c
  31. 2
      src/modules/connman/agent.c
  32. 2
      src/modules/everything/evry_config.c
  33. 2
      src/modules/everything/evry_gadget.c
  34. 6
      src/modules/everything/evry_plug_apps.c
  35. 2
      src/modules/fileman/e_fwin.c
  36. 2
      src/modules/fileman/e_int_config_mime_edit.c
  37. 8
      src/modules/mixer/app_mixer.c
  38. 2
      src/modules/mixer/conf_module.c
  39. 4
      src/modules/packagekit/e_mod_config.c
  40. 2
      src/modules/shot/e_mod_main.c

1
po/POTFILES.in
Unescape View File

@ -21,7 +21,6 @@ src/bin/e_desktop_editor.c
src/bin/e_dialog.c
src/bin/e_dnd.c
src/bin/e_dpms.c
src/bin/e_entry.c
src/bin/e_entry_dialog.c
src/bin/e_error.c
src/bin/e_exec.c

2
src/bin/Makefile.mk
Unescape View File

@ -72,7 +72,6 @@ src/bin/e_dialog.h \
src/bin/e_dnd.h \
src/bin/e_dpms.h \
src/bin/e_desktop_editor.h \
src/bin/e_entry.h \
src/bin/e_entry_dialog.h \
src/bin/e_env.h \
src/bin/e_error.h \
@ -242,7 +241,6 @@ src/bin/e_dialog.c \
src/bin/e_dpms.c \
src/bin/e_desktop_editor.c \
src/bin/e_dnd.c \
src/bin/e_entry.c \
src/bin/e_entry_dialog.c \
src/bin/e_env.c \
src/bin/e_error.c \

19
src/bin/e_desktop_editor.c
Unescape View File

@ -694,10 +694,11 @@ _e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas
{
E_Desktop_Edit *editor = cfdata->editor;
E_Radio_Group *rg;
Evas_Object *otb, *ol, *o, *ot;
Evas_Object *otb, *ol, *o, *ot, *win;
Evas_Coord mw, mh;
editor->evas = evas;
win = e_win_evas_win_get(evas);
otb = e_widget_toolbook_add(evas, 48 * e_scale, 48 * e_scale);
@ -706,7 +707,7 @@ _e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas
o = e_widget_label_add(evas, _("Name"));
e_widget_table_object_append(ot, o, 0, 0, 1, 1, 1, 1, 0, 0);
o = e_widget_entry_add(evas, &(cfdata->name), NULL, NULL, NULL);
o = e_widget_entry_add(win, &(cfdata->name), NULL, NULL, NULL);
e_widget_size_min_get(o, &mw, &mh);
if (mw < 220) mw = 220;
e_widget_size_min_set(o, mw, mh);
@ -717,7 +718,7 @@ _e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas
o = e_widget_label_add(evas, _("Comment"));
e_widget_table_object_append(ot, o, 0, 1, 1, 1, 1, 1, 0, 0);
o = e_widget_entry_add(evas, &(cfdata->comment), NULL, NULL, NULL);
o = e_widget_entry_add(win, &(cfdata->comment), NULL, NULL, NULL);
e_widget_table_object_append(ot, o, 1, 1, 1, 1, 1, 1, 1, 0);
rg = e_widget_radio_group_new(&(cfdata->type));
@ -761,7 +762,7 @@ _e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas
o = e_widget_label_add(evas, _("Icon"));
e_widget_table_object_append(ot, o, 0, 1, 1, 1, 1, 1, 0, 0);
o = e_widget_entry_add(evas, &(cfdata->icon), NULL, NULL, NULL);
o = e_widget_entry_add(win, &(cfdata->icon), NULL, NULL, NULL);
cfdata->icon_entry = o;
e_widget_on_change_hook_set(o, _e_desktop_editor_icon_entry_changed, cfdata);
e_widget_table_object_append(ot, o, 1, 1, 1, 1, 1, 1, 1, 0);
@ -774,33 +775,33 @@ _e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas
o = e_widget_label_add(evas, _("Generic Name"));
e_widget_table_object_append(ot, o, 0, 0, 1, 1, 1, 1, 0, 0);
o = e_widget_entry_add(evas, &(cfdata->generic_name), NULL, NULL, NULL);
o = e_widget_entry_add(win, &(cfdata->generic_name), NULL, NULL, NULL);
e_widget_table_object_append(ot, o, 1, 0, 1, 1, 1, 1, 1, 0);
o = e_widget_label_add(evas, _("Window Class"));
e_widget_table_object_append(ot, o, 0, 1, 1, 1, 1, 1, 0, 0);
o = e_widget_entry_add(evas, &(cfdata->startup_wm_class), NULL, NULL, NULL);
o = e_widget_entry_add(win, &(cfdata->startup_wm_class), NULL, NULL, NULL);
e_widget_table_object_append(ot, o, 1, 1, 1, 1, 1, 1, 1, 0);
o = e_widget_label_add(evas, _("Categories"));
e_widget_table_object_append(ot, o, 0, 2, 1, 1, 1, 1, 0, 0);
o = e_widget_entry_add(evas, &(cfdata->categories), NULL, NULL, NULL);
o = e_widget_entry_add(win, &(cfdata->categories), NULL, NULL, NULL);
e_widget_on_change_hook_set(o, _e_desktop_editor_categories_changed, cfdata);
e_widget_table_object_append(ot, o, 1, 2, 1, 1, 1, 1, 1, 0);
o = e_widget_label_add(evas, _("Mime Types"));
e_widget_table_object_append(ot, o, 0, 3, 1, 1, 1, 1, 0, 0);
o = e_widget_entry_add(evas, &(cfdata->mimes), NULL, NULL, NULL);
o = e_widget_entry_add(win, &(cfdata->mimes), NULL, NULL, NULL);
e_widget_on_change_hook_set(o, _e_desktop_editor_mimes_changed, cfdata);
e_widget_table_object_append(ot, o, 1, 3, 1, 1, 1, 1, 1, 0);
o = e_widget_label_add(evas, _("Desktop file"));
e_widget_table_object_append(ot, o, 0, 4, 1, 1, 1, 1, 0, 0);
o = e_widget_entry_add(evas, NULL, NULL, NULL, NULL);
o = e_widget_entry_add(win, NULL, NULL, NULL, NULL);
e_widget_table_object_append(ot, o, 1, 4, 1, 1, 1, 1, 1, 0);
e_widget_entry_readonly_set(o, 1);
cfdata->orig_path_entry = o;

1048
src/bin/e_entry.c
View File

File diff suppressed because it is too large Load Diff

22
src/bin/e_entry.h
Unescape View File

@ -1,22 +0,0 @@
#ifdef E_TYPEDEFS
#else
#ifndef E_ENTRY_H
#define E_ENTRY_H
EAPI Evas_Object *e_entry_add (Evas *evas);
EAPI void e_entry_text_set (Evas_Object *entry, const char *text);
EAPI const char *e_entry_text_get (Evas_Object *entry);
EAPI void e_entry_clear (Evas_Object *entry);
EAPI void e_entry_select_all (Evas_Object *entry);
EAPI void e_entry_password_set (Evas_Object *entry, int password_mode);
EAPI void e_entry_size_min_get (Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh);
EAPI void e_entry_focus (Evas_Object *entry);
EAPI void e_entry_unfocus (Evas_Object *entry);
EAPI void e_entry_enable (Evas_Object *entry);
EAPI void e_entry_disable (Evas_Object *entry);
EAPI void e_entry_edit (Evas_Object *entry);
EAPI void e_entry_noedit (Evas_Object *entry);
EAPI void e_entry_nomenu(Evas_Object *entry);
#endif
#endif

2
src/bin/e_entry_dialog.c
Unescape View File

@ -56,7 +56,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(e, &(ed->text), NULL, NULL, NULL);
ed->entry = e_widget_entry_add(dia->win, &(ed->text), NULL, NULL, NULL);
evas_object_smart_callback_add(ed->entry, "key_down", _e_entry_cb_key_down, ed);
e_widget_list_object_append(o, ed->entry, 1, 1, 0.5);
e_widget_size_min_get(o, &w, &h);

2
src/bin/e_fm.c
Unescape View File

@ -10345,7 +10345,7 @@ _e_fm2_icon_entry_widget_add(E_Fm2_Icon *ic)
return NULL;
e = evas_object_evas_get(ic->obj);
ic->entry_widget = e_widget_entry_add(e, NULL, NULL, NULL, NULL);
ic->entry_widget = e_widget_entry_add(e_win_evas_win_get(e), NULL, NULL, NULL, NULL);
evas_object_event_callback_add(ic->entry_widget, EVAS_CALLBACK_KEY_DOWN,
_e_fm2_icon_entry_widget_cb_key_down, ic);
#ifndef HAVE_WAYLAND_ONLY

23
src/bin/e_fm_prop.c
Unescape View File

@ -376,11 +376,12 @@ static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
/* generate the core widget layout for a basic dialog */
Evas_Object *o, *ot, *ob, *of, *oi;
Evas_Object *o, *ot, *ob, *of, *oi, *win;
E_Radio_Group *rg;
char buf[PATH_MAX];
const char *itype = NULL;
win = cfd->dia->win;
snprintf(buf, sizeof(buf), "%s/%s",
cfdata->location, cfdata->fi->file);
o = e_widget_table_add(evas, 0);
@ -389,62 +390,62 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
ob = e_widget_label_add(evas, _("Name:"));
e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
ob = e_widget_entry_add(evas, &(cfdata->file), NULL, NULL, NULL);
ob = e_widget_entry_add(win, &(cfdata->file), NULL, NULL, NULL);
e_widget_size_min_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, _("Location:"));
e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 0, 1, 0);
ob = e_widget_entry_add(evas, &(cfdata->location), NULL, NULL, NULL);
ob = e_widget_entry_add(win, &(cfdata->location), NULL, NULL, NULL);
e_widget_size_min_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, _("Size:"));
e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 0, 1, 0);
ob = e_widget_entry_add(evas, &(cfdata->size), NULL, NULL, NULL);
ob = e_widget_entry_add(win, &(cfdata->size), NULL, NULL, NULL);
e_widget_size_min_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, _("Occupied blocks on disk:"));
e_widget_table_object_append(ot, ob, 0, 3, 1, 1, 1, 0, 1, 0);
ob = e_widget_entry_add(evas, &(cfdata->blocks), NULL, NULL, NULL);
ob = e_widget_entry_add(win, &(cfdata->blocks), NULL, NULL, NULL);
e_widget_size_min_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);
ob = e_widget_label_add(evas, _("Last Accessed:"));
e_widget_table_object_append(ot, ob, 0, 4, 1, 1, 1, 0, 1, 0);
ob = e_widget_entry_add(evas, &(cfdata->acc_date), NULL, NULL, NULL);
ob = e_widget_entry_add(win, &(cfdata->acc_date), NULL, NULL, NULL);
e_widget_size_min_set(ob, 140, -1);
e_widget_entry_readonly_set(ob, 1);
e_widget_table_object_append(ot, ob, 1, 4, 1, 1, 1, 0, 1, 0);
ob = e_widget_label_add(evas, _("Last Modified:"));
e_widget_table_object_append(ot, ob, 0, 5, 1, 1, 1, 0, 1, 0);
ob = e_widget_entry_add(evas, &(cfdata->mod_date), NULL, NULL, NULL);
ob = e_widget_entry_add(win, &(cfdata->mod_date), NULL, NULL, NULL);
e_widget_size_min_set(ob, 140, -1);
e_widget_entry_readonly_set(ob, 1);
e_widget_table_object_append(ot, ob, 1, 5, 1, 1, 1, 0, 1, 0);
ob = e_widget_label_add(evas, _("Last Modified Permissions:"));
e_widget_table_object_append(ot, ob, 0, 6, 1, 1, 1, 0, 1, 0);
ob = e_widget_entry_add(evas, &(cfdata->pms_date), NULL, NULL, NULL);
ob = e_widget_entry_add(win, &(cfdata->pms_date), NULL, NULL, NULL);
e_widget_size_min_set(ob, 140, -1);
e_widget_entry_readonly_set(ob, 1);
e_widget_table_object_append(ot, ob, 1, 6, 1, 1, 1, 0, 1, 0);
ob = e_widget_label_add(evas, _("File Type:"));
e_widget_table_object_append(ot, ob, 0, 7, 1, 1, 1, 0, 1, 0);
ob = e_widget_entry_add(evas, &(cfdata->mime), NULL, NULL, NULL);
ob = e_widget_entry_add(win, &(cfdata->mime), NULL, NULL, NULL);
e_widget_size_min_set(ob, 140, -1);
e_widget_entry_readonly_set(ob, 1);
e_widget_table_object_append(ot, ob, 1, 7, 1, 1, 1, 0, 1, 0);
of = e_widget_frametable_add(evas, _("Permissions"), 0);
ob = e_widget_entry_add(evas, &(cfdata->owner), NULL, NULL, NULL);
ob = e_widget_entry_add(win, &(cfdata->owner), NULL, NULL, NULL);
e_widget_entry_readonly_set(ob, 1);
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
@ -550,7 +551,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), NULL, NULL, NULL);
ob = e_widget_entry_add(win, &(cfdata->link), NULL, NULL, NULL);
e_widget_frametable_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
if (cfdata->fi->broken_link)

1
src/bin/e_includes.h
Unescape View File

@ -21,7 +21,6 @@
#include "e_menu.h"
#include "e_icon.h"
#include "e_flowlayout.h"
#include "e_entry.h"
#include "e_init.h"
#include "e_int_menus.h"
#include "e_module.h"

2
src/bin/e_int_client_prop.c
Unescape View File

@ -413,7 +413,7 @@ _ec_go(void *data, void *data2)
ob = e_widget_label_add(evas, label); \
if (!cfdata->val) e_widget_disabled_set(ob, 1); \
e_widget_table_object_append(o, ob, x, y, 1, 1, 1, 1, 0, 1); \
ob = e_widget_entry_add(evas, & (cfdata->val), NULL, NULL, NULL); \
ob = e_widget_entry_add(dia->win, & (cfdata->val), NULL, NULL, NULL); \
e_widget_entry_readonly_set(ob, 1); \
e_widget_size_min_get(ob, &mw, &mh); \
e_widget_size_min_set(ob, 160, mh); \

12
src/bin/e_int_client_remember.c
Unescape View File

@ -659,7 +659,7 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dial
}
static Evas_Object *
_advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
/* generate the core widget layout for an advanced dialog */
Evas_Object *o, *ob, *of, *oc;
@ -674,7 +674,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D
ob = e_widget_check_add(evas, _("Window name"),
&(cfdata->remember.match_name));
e_widget_list_object_append(of, ob, 1, 0, 0.5);
ob = e_widget_entry_add(evas, &cfdata->name, NULL, NULL, NULL);
ob = e_widget_entry_add(cfd->dia->win, &cfdata->name, NULL, NULL, NULL);
e_widget_list_object_append(of, ob, 1, 0, 0.5);
}
else
@ -686,7 +686,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D
ob = e_widget_check_add(evas, _("Window class"),
&(cfdata->remember.match_class));
e_widget_list_object_append(of, ob, 1, 0, 0.5);
ob = e_widget_entry_add(evas, &cfdata->class, NULL, NULL, NULL);
ob = e_widget_entry_add(cfd->dia->win, &cfdata->class, NULL, NULL, NULL);
e_widget_list_object_append(of, ob, 1, 0, 0.5);
}
else
@ -698,7 +698,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D
ob = e_widget_check_add(evas, _("Title"),
&(cfdata->remember.match_title));
e_widget_list_object_append(of, ob, 1, 0, 0.5);
ob = e_widget_entry_add(evas, &cfdata->title, NULL, NULL, NULL);
ob = e_widget_entry_add(cfd->dia->win, &cfdata->title, NULL, NULL, NULL);
e_widget_list_object_append(of, ob, 1, 0, 0.5);
}
else
@ -710,7 +710,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D
ob = e_widget_check_add(evas, _("Window Role"),
&(cfdata->remember.match_role));
e_widget_list_object_append(of, ob, 1, 0, 0.5);
ob = e_widget_entry_add(evas, &cfdata->role, NULL, NULL, NULL);
ob = e_widget_entry_add(cfd->dia->win, &cfdata->role, NULL, NULL, NULL);
e_widget_list_object_append(of, ob, 1, 0, 0.5);
}
else
@ -790,7 +790,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D
oc = e_widget_check_add(evas, _("Application file or name (.desktop)"),
&(cfdata->remember.apply_desktop_file));
e_widget_table_object_append(of, oc, 0, 8, 1, 1, 1, 0, 1, 0);
ob = e_widget_entry_add(evas, &cfdata->desktop, NULL, NULL, NULL);
ob = e_widget_entry_add(cfd->dia->win, &cfdata->desktop, NULL, NULL, NULL);
e_widget_check_widget_disable_on_unchecked_add(oc, ob);
e_widget_table_object_append(of, ob, 0, 9, 2, 1, 1, 0, 1, 0);
e_widget_toolbook_page_append(o, NULL, _("Properties"), of, 1, 1, 1, 1, 0.5, 0.0);

8
src/bin/e_int_config_comp_match.c
Unescape View File

@ -349,7 +349,7 @@ _create_edit_frame(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdat
else m->title = NULL;
lb = e_widget_label_add(evas, _("Title"));
e_widget_table_object_append(tab2, lb, 0, 0, 1, 1, 1, 0, 0, 0);
en = e_widget_entry_add(evas, &(m->title), NULL, NULL, NULL);
en = e_widget_entry_add(cfd->dia->win, &(m->title), NULL, NULL, NULL);
e_widget_table_object_append(tab2, en, 1, 0, 1, 1, 1, 0, 1, 0);
}
if ((cfdata->edit_il == cfdata->borders_il) ||
@ -360,7 +360,7 @@ _create_edit_frame(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdat
else m->name = NULL;
lb = e_widget_label_add(evas, _("Name"));
e_widget_table_object_append(tab2, lb, 0, 1, 1, 1, 1, 0, 0, 0);
en = e_widget_entry_add(evas, &(m->name), NULL, NULL, NULL);
en = e_widget_entry_add(cfd->dia->win, &(m->name), NULL, NULL, NULL);
e_widget_table_object_append(tab2, en, 1, 1, 1, 1, 1, 0, 1, 0);
}
if ((cfdata->edit_il == cfdata->borders_il) ||
@ -370,7 +370,7 @@ _create_edit_frame(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdat
else m->clas = NULL;
lb = e_widget_label_add(evas, _("Class"));
e_widget_table_object_append(tab2, lb, 0, 2, 1, 1, 1, 0, 0, 0);
en = e_widget_entry_add(evas, &(m->clas), NULL, NULL, NULL);
en = e_widget_entry_add(cfd->dia->win, &(m->clas), NULL, NULL, NULL);
e_widget_table_object_append(tab2, en, 1, 2, 1, 1, 1, 0, 1, 0);
}
if (cfdata->edit_il == cfdata->borders_il)
@ -379,7 +379,7 @@ _create_edit_frame(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdat
else m->role = NULL;
lb = e_widget_label_add(evas, _("Role"));
e_widget_table_object_append(tab2, lb, 0, 3, 1, 1, 1, 0, 0, 0);
en = e_widget_entry_add(evas, &(m->role), NULL, NULL, NULL);
en = e_widget_entry_add(cfd->dia->win, &(m->role), NULL, NULL, NULL);
e_widget_table_object_append(tab2, en, 1, 3, 1, 1, 1, 0, 1, 0);
}
e_widget_toolbook_page_append(tb, NULL, _("Names"), tab2, 1, 1, 1, 1, 0.5, 0.0);

4
src/bin/e_widget_config_list.c
Unescape View File

@ -32,7 +32,7 @@ struct _E_Widget_Data
/* Externally accessible functions */
EAPI Evas_Object *
e_widget_config_list_add(Evas *evas, Evas_Object * (*func_entry_add)(Evas * evas, char **val, void (*func)(void *data, void *data2), void *data, void *data2), const char *label, int listspan __UNUSED__)
e_widget_config_list_add(Evas *evas, Evas_Object * (*func_entry_add)(Evas_Object *, char **val, void (*func)(void *data, void *data2), void *data, void *data2), const char *label, int listspan __UNUSED__)
{
Evas_Object *obj, *o;
E_Widget_Data *wd;
@ -51,7 +51,7 @@ e_widget_config_list_add(Evas *evas, Evas_Object * (*func_entry_add)(Evas * evas
o = e_widget_label_add(evas, label);
e_widget_table_object_append(wd->gui.table, o, 0, 1, 2, 1, 1, 0, 1, 0);
o = func_entry_add(evas, &(wd->cur_entry), NULL, NULL, NULL);
o = func_entry_add(e_win_evas_win_get(evas), &(wd->cur_entry), NULL, NULL, NULL);
wd->gui.entry = o;
e_widget_disabled_set(o, 1);
e_widget_size_min_set(o, 100, 25);

2
src/bin/e_widget_config_list.h
Unescape View File

@ -4,7 +4,7 @@
#define E_WIDGET_CONFIG_LIST_H
EAPI Evas_Object *e_widget_config_list_add(Evas *evas, Evas_Object *(*func_entry_add) (Evas *evas, char **val, void (*func) (void *data, void *data2), void *data, void *data2), const char *label, int listspan);
EAPI Evas_Object *e_widget_config_list_add(Evas *evas, Evas_Object *(*func_entry_add) (Evas_Object *, char **val, void (*func) (void *data, void *data2), void *data, void *data2), const char *label, int listspan);
EAPI int e_widget_config_list_count(Evas_Object *obj);
EAPI const char *e_widget_config_list_nth_get(Evas_Object *obj, int n);
EAPI void e_widget_config_list_append(Evas_Object *obj, const char *entry);

2
src/bin/e_widget_csel.c
Unescape View File

@ -267,7 +267,7 @@ e_widget_csel_add(Evas *evas, E_Color *color, Eina_Bool alpha_enabled)
e_widget_size_min_set(o, 32, 16);
e_widget_table_object_append(frame, o, 1, i, 6, 1, 1, 1, 1, 0);
o = e_widget_entry_add(evas, &(wd->values[i]), NULL, NULL, NULL);
o = e_widget_entry_add(e_win_evas_win_get(evas), &(wd->values[i]), NULL, NULL, NULL);
e_widget_sub_object_add(obj, o);
evas_object_show(o);
wd->entries = eina_list_append(wd->entries, o);

48
src/bin/e_widget_entry.c
Unescape View File

@ -36,12 +36,14 @@ static void _e_wid_movresz(void *data, Evas *e, Evas_Object *obj, void *event_in
* @return Returns the new entry widget
*/
EAPI Evas_Object *
e_widget_entry_add(Evas *evas, char **text_location, void (*func)(void *data, void *data2), void *data, void *data2)
e_widget_entry_add(Evas_Object *parent, 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;
Evas *evas;
evas = evas_object_evas_get(parent);
obj = e_widget_add(evas);
e_widget_del_hook_set(obj, _e_wid_del_hook);
@ -52,8 +54,17 @@ e_widget_entry_add(Evas *evas, char **text_location, void (*func)(void *data, vo
e_widget_data_set(obj, wd);
wd->text_location = text_location;
o = e_entry_add(evas);
o = elm_entry_add(parent);
elm_object_text_set(o, "test");
elm_entry_scrollable_set(o, 1);
elm_entry_single_line_set(o, 1);
elm_entry_scrollbar_policy_set(o, ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF);
wd->o_entry = o;
evas_object_size_hint_min_get(wd->o_entry, &minw, &minh);
e_widget_size_min_set(obj, minw, minh);
evas_object_size_hint_min_set(obj, minw, minh);
elm_object_text_set(o, NULL);
e_widget_sub_object_add(obj, o);
e_widget_resize_object_set(obj, o);
evas_object_show(o);
@ -76,11 +87,7 @@ e_widget_entry_add(Evas *evas, char **text_location, void (*func)(void *data, vo
o = wd->o_entry;
if ((text_location) && (*text_location))
e_entry_text_set(o, *text_location);
e_entry_size_min_get(o, &minw, &minh);
e_widget_size_min_set(obj, minw, minh);
evas_object_size_hint_min_set(obj, minw, minh);
elm_object_text_set(o, *text_location);
wd->func = func;
wd->data = data;
@ -103,7 +110,7 @@ e_widget_entry_text_set(Evas_Object *entry, const char *text)
if (!(entry) || (!(wd = e_widget_data_get(entry))))
return;
e_entry_text_set(wd->o_entry, text);
elm_object_text_set(wd->o_entry, text);
}
/**
@ -119,7 +126,7 @@ e_widget_entry_text_get(Evas_Object *entry)
if (!(entry) || (!(wd = e_widget_data_get(entry))))
return NULL;
return e_entry_text_get(wd->o_entry);
return elm_object_text_get(wd->o_entry);
}
/**
@ -134,7 +141,7 @@ e_widget_entry_clear(Evas_Object *entry)
if (!(entry) || (!(wd = e_widget_data_get(entry))))
return;
e_entry_clear(wd->o_entry);
elm_object_text_set(wd->o_entry, NULL);
}
/**
@ -151,7 +158,7 @@ e_widget_entry_password_set(Evas_Object *entry, int password_mode)
if (!(entry) || (!(wd = e_widget_data_get(entry))))
return;
e_entry_password_set(wd->o_entry, password_mode);
elm_entry_password_set(wd->o_entry, !!password_mode);
}
/**
@ -169,10 +176,7 @@ e_widget_entry_readonly_set(Evas_Object *entry, int readonly_mode)
if (!(entry) || (!(wd = e_widget_data_get(entry))))
return;
if (readonly_mode)
e_entry_noedit(wd->o_entry);
else
e_entry_edit(wd->o_entry);
elm_entry_editable_set(wd->o_entry, !readonly_mode);
}
/**
@ -187,7 +191,7 @@ e_widget_entry_select_all(Evas_Object *entry)
if (!(entry) || (!(wd = e_widget_data_get(entry))))
return;
e_entry_select_all(wd->o_entry);
elm_entry_select_all(wd->o_entry);
}
/* Private functions */
@ -219,10 +223,7 @@ _e_wid_focus_hook(Evas_Object *obj)
if (!(obj) || (!(wd = e_widget_data_get(obj))))
return;
if (e_widget_focus_get(obj))
e_entry_focus(wd->o_entry);
else
e_entry_unfocus(wd->o_entry);
elm_object_focus_set(wd->o_entry, !!e_widget_focus_get(obj));
}
static void
@ -233,10 +234,7 @@ _e_wid_disable_hook(Evas_Object *obj)
if (!(obj) || (!(wd = e_widget_data_get(obj))))
return;
if (e_widget_disabled_get(obj))
e_entry_disable(wd->o_entry);
else
e_entry_enable(wd->o_entry);
elm_object_disabled_set(wd->o_entry, !!e_widget_disabled_get(obj));
}
static void
@ -285,7 +283,7 @@ _e_wid_changed_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
if (wd->text_location)
{
text = e_entry_text_get(wd->o_entry);
text = elm_object_text_get(wd->o_entry);
free(*wd->text_location);
*wd->text_location = text ? strdup(text) : NULL;
}

2
src/bin/e_widget_entry.h
Unescape View File

@ -3,7 +3,7 @@
#ifndef E_WIDGET_ENTRY_H
#define E_WIDGET_ENTRY_H
EAPI Evas_Object *e_widget_entry_add (Evas *evas, char **text_location, void (*func) (void *data, void *data2), void *data, void *data2);
EAPI Evas_Object *e_widget_entry_add (Evas_Object *parent, 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);

13
src/bin/e_widget_filepreview.c
Unescape View File

@ -301,9 +301,10 @@ static void
_e_wid_fprev_preview_video_widgets(E_Widget_Data *wd)
{
Evas *evas = evas_object_evas_get(wd->obj);
Evas_Object *o, *em;
Evas_Object *o, *em, *win;
int mw, mh, y = 3;
win = e_win_evas_win_get(evas);
_e_wid_fprev_clear_widgets(wd);
o = e_widget_table_add(evas, 0);
@ -316,7 +317,7 @@ _e_wid_fprev_preview_video_widgets(E_Widget_Data *wd)
e_widget_table_object_align_append(wd->o_preview_properties_table, \
wd->labob, \
0, y, 1, 1, 0, 1, 0, 0, 1.0, 0.0); \
o = e_widget_entry_add(evas, &(wd->preview_extra_text), NULL, NULL, NULL); \
o = e_widget_entry_add(win, &(wd->preview_extra_text), NULL, NULL, NULL); \
e_widget_entry_readonly_set(o, 1); \
wd->entob = o; \
e_widget_size_min_set(o, entw, -1); \
@ -384,9 +385,10 @@ static void
_e_wid_fprev_preview_fs_widgets(E_Widget_Data *wd, Eina_Bool mount_point)
{
Evas *evas = evas_object_evas_get(wd->obj);
Evas_Object *o;
Evas_Object *o, *win;
int mw, mh, y = 0;
win = e_win_evas_win_get(evas);
_e_wid_fprev_clear_widgets(wd);
o = e_widget_table_add(evas, 0);
@ -399,7 +401,7 @@ _e_wid_fprev_preview_fs_widgets(E_Widget_Data *wd, Eina_Bool mount_point)
e_widget_table_object_align_append(wd->o_preview_properties_table, \
wd->labob, \
0, y, 1, 1, 0, 1, 0, 0, 1.0, 0.0); \
o = e_widget_entry_add(evas, &(wd->preview_extra_text), NULL, NULL, NULL); \
o = e_widget_entry_add(win, &(wd->preview_extra_text), NULL, NULL, NULL); \
e_widget_entry_readonly_set(o, 1); \
wd->entob = o; \
e_widget_size_min_set(o, entw, -1); \
@ -440,9 +442,10 @@ static void
_e_wid_fprev_preview_file_widgets(E_Widget_Data *wd, Eina_Bool dir, Eina_Bool txt, Eina_Bool font)
{
Evas *evas = evas_object_evas_get(wd->obj);
Evas_Object *o;
Evas_Object *o, *win;
int mw, mh, y = 0;
win = e_win_evas_win_get(evas);
_e_wid_fprev_clear_widgets(wd);
o = e_widget_table_add(evas, 0);

2
src/bin/e_widget_fsel.c
Unescape View File

@ -447,7 +447,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
e_widget_size_min_set(o, 128, 128);
e_widget_table_object_append(wd->o_table2, o, 1, 1, 1, 1, 1, 1, 0, 1);
o = e_widget_entry_add(evas, &(wd->entry_text), NULL, NULL, NULL);
o = e_widget_entry_add(e_win_evas_win_get(evas), &(wd->entry_text), NULL, NULL, NULL);
wd->o_entry = o;
if (selected) e_widget_entry_text_set(o, selected);

2
src/modules/conf_applications/e_int_config_defapps.c
Unescape View File

@ -297,7 +297,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
ob = e_widget_label_add(evas, _("Custom Browser Command"));
e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 1, 0, 0);
ob = e_widget_entry_add(evas, &(cfdata->browser_custom), NULL, NULL, NULL);
ob = e_widget_entry_add(cfd->dia->win, &(cfdata->browser_custom), NULL, NULL, NULL);
cfdata->obj.entry = ob;
e_widget_table_object_append(ot, ob, 1, 0, 1, 1, 1, 1, 1, 0);

4
src/modules/conf_bindings/e_int_config_acpibindings.c
Unescape View File

@ -181,7 +181,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__,
}
static Evas_Object *
_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata)
_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *ol, *of, *ow, *ot;
@ -215,7 +215,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
ow = e_widget_framelist_add(evas, _("Action Params"), 0);
cfdata->o_params =
e_widget_entry_add(evas, NULL, _cb_entry_changed, cfdata, NULL);
e_widget_entry_add(cfd->dia->win, NULL, _cb_entry_changed, cfdata, NULL);
e_widget_disabled_set(cfdata->o_params, EINA_TRUE);
e_widget_framelist_object_append(ow, cfdata->o_params);
e_widget_table_object_append(ot, ow, 0, 1, 1, 1, 1, 0, 1, 0);

4
src/modules/conf_bindings/e_int_config_edgebindings.c
Unescape View File

@ -242,7 +242,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
}
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata)
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ol, *ot, *of, *ob;
@ -289,7 +289,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
cfdata->gui.o_button = ob;
of = e_widget_framelist_add(evas, _("Action Params"), 0);
ob = e_widget_entry_add(evas, &(cfdata->locals.params), NULL, NULL, NULL);
ob = e_widget_entry_add(cfd->dia->win, &(cfdata->locals.params), NULL, NULL, NULL);
cfdata->gui.o_params = ob;
e_widget_disabled_set(ob, 1);
e_widget_framelist_object_append(of, ob);

4
src/modules/conf_bindings/e_int_config_keybindings.c
Unescape View File

@ -222,7 +222,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__,
}
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata)
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ot, *of, *ob;
@ -262,7 +262,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
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), NULL, NULL, NULL);
ob = e_widget_entry_add(cfd->dia->win, &(cfdata->locals.params), NULL, NULL, NULL);
cfdata->gui.o_params = ob;
e_widget_disabled_set(ob, 1);
e_widget_framelist_object_append(of, ob);

4
src/modules/conf_bindings/e_int_config_mousebindings.c
Unescape View File

@ -276,7 +276,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
}
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata)
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *of, *ot, *ob;
E_Radio_Group *rg;
@ -317,7 +317,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
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), NULL, NULL, NULL);
ob = e_widget_entry_add(cfd->dia->win, &(cfdata->locals.params), NULL, NULL, NULL);
e_widget_disabled_set(ob, 1);
cfdata->gui.o_params = ob;
e_widget_framelist_object_append(of, ob);

8
src/modules/conf_bindings/e_int_config_signalbindings.c
Unescape View File

@ -630,12 +630,12 @@ _signal_add_show(E_Config_Dialog_Data *cfdata)
obg = e_widget_list_add(evas, 1, 0);
ol = e_widget_framelist_add(evas, _("Source:"), 0);
entry = o = e_widget_entry_add(evas, &cfdata->locals.dia_source, NULL, NULL, NULL);
entry = o = e_widget_entry_add(cfdata->locals.dia->win, &cfdata->locals.dia_source, NULL, NULL, NULL);
e_widget_framelist_object_append(ol, o);
e_widget_list_object_append(obg, ol, 1, 0, 0.5);
ol = e_widget_framelist_add(evas, _("Signal:"), 0);
o = e_widget_entry_add(evas, &cfdata->locals.dia_signal, NULL, NULL, NULL);
o = e_widget_entry_add(cfdata->locals.dia->win, &cfdata->locals.dia_signal, NULL, NULL, NULL);
e_widget_framelist_object_append(ol, o);
e_widget_list_object_append(obg, ol, 1, 0, 0.5);
@ -770,7 +770,7 @@ _restore_signal_binding_defaults_cb(void *data, void *data2 __UNUSED__)
}
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata)
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ol, *ot, *of, *ob;
@ -807,7 +807,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
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), NULL, NULL, NULL);
ob = e_widget_entry_add(cfd->dia->win, &(cfdata->locals.params), NULL, NULL, NULL);
cfdata->gui.o_params = ob;
e_widget_disabled_set(ob, 1);
e_widget_framelist_object_append(of, ob);

6
src/modules/conf_display/e_int_config_desk.c
Unescape View File

@ -161,7 +161,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
}
static Evas_Object *
_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata)
_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *of, *ol, *ob;
E_Zone *zone;
@ -173,13 +173,13 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
ol = e_widget_list_add(evas, 0, 1);
ob = e_widget_label_add(evas, _("Name"));
e_widget_list_object_append(ol, ob, 1, 0, 0.5);
ob = e_widget_entry_add(evas, &(cfdata->name), NULL, NULL, NULL);
ob = e_widget_entry_add(cfd->dia->win, &(cfdata->name), NULL, NULL, NULL);
e_widget_list_object_append(ol, ob, 1, 1, 0.5);
e_widget_list_object_append(o, ol, 1, 1, 0.5);
of = e_widget_frametable_add(evas, _("Desktop Window Profile"), 0);
ob = e_widget_label_add(evas, _("Profile name"));
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 0, 0);
ob = e_widget_entry_add(evas, &(cfdata->profile), NULL, NULL, NULL);
ob = e_widget_entry_add(cfd->dia->win, &(cfdata->profile), NULL, NULL, NULL);
e_widget_disabled_set(ob, !(e_config->use_desktop_window_profile));
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);

8
src/modules/conf_display/e_int_config_desklock.c
Unescape View File

@ -210,7 +210,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
}
static Evas_Object *
_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
E_Config_XKB_Layout *cl;
int grp = 0;
@ -249,19 +249,19 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
e_widget_list_object_append(ol, ow, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Personal Screenlock Password"), 0);
cfdata->passwd_entry = ow = e_widget_entry_add(evas, &(cfdata->desklock_personal_passwd), NULL, NULL, NULL);
cfdata->passwd_entry = ow = e_widget_entry_add(cfd->dia->win, &(cfdata->desklock_personal_passwd), NULL, NULL, NULL);
e_widget_entry_password_set(ow, 1);
e_widget_framelist_object_append(of, ow);
e_widget_list_object_append(ol, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("PIN Entry"), 0);
cfdata->pin_entry = ow = e_widget_entry_add(evas, &(cfdata->pin_str), NULL, NULL, NULL);
cfdata->pin_entry = ow = e_widget_entry_add(cfd->dia->win, &(cfdata->pin_str), NULL, NULL, NULL);
e_widget_entry_password_set(ow, 1);
e_widget_framelist_object_append(of, ow);
e_widget_list_object_append(ol, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("External Screenlock Command"), 0);
cfdata->lock_cmd_entry = ow = e_widget_entry_add(evas, &(cfdata->custom_lock_cmd), NULL, NULL, NULL);
cfdata->lock_cmd_entry = ow = e_widget_entry_add(cfd->dia->win, &(cfdata->custom_lock_cmd), NULL, NULL, NULL);
e_widget_framelist_object_append(of, ow);
e_widget_disabled_set(cfdata->passwd_entry,

14
src/modules/conf_intl/e_int_config_imc.c
Unescape View File

@ -796,7 +796,7 @@ e_int_config_imc_update(E_Config_Dialog *dia, const char *file)
}
static Evas_Object *
_advanced_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata)
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *rt, *ot;
Evas_Object *ow, *of;
@ -895,21 +895,21 @@ _advanced_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_
ow = e_widget_label_add(evas, _("Name"));
e_widget_frametable_object_append(of, ow, 0, 0, 1, 1, 1, 1, 0, 0);
ow = e_widget_entry_add(evas, &(cfdata->imc.e_im_name), NULL, NULL, NULL);
ow = e_widget_entry_add(cfd->dia->win, &(cfdata->imc.e_im_name), NULL, NULL, NULL);
e_widget_on_change_hook_set(ow, _e_imc_entry_change_cb, cfdata);
cfdata->gui.e_im_name = ow;
e_widget_frametable_object_append(of, ow, 1, 0, 1, 1, 1, 1, 1, 0);
ow = e_widget_label_add(evas, _("Execute Command"));
e_widget_frametable_object_append(of, ow, 0, 1, 1, 1, 1, 1, 0, 0);
ow = e_widget_entry_add(evas, &(cfdata->imc.e_im_exec), NULL, NULL, NULL);
ow = e_widget_entry_add(cfd->dia->win, &(cfdata->imc.e_im_exec), NULL, NULL, NULL);
e_widget_on_change_hook_set(ow, _e_imc_entry_change_cb, cfdata);
cfdata->gui.e_im_exec = ow;
e_widget_frametable_object_append(of, ow, 1, 1, 1, 1, 1, 1, 1, 0);
ow = e_widget_label_add(evas, _("Setup Command"));
e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 1, 0, 0);
ow = e_widget_entry_add(evas, &(cfdata->imc.e_im_setup_exec), NULL, NULL, NULL);
ow = e_widget_entry_add(cfd->dia->win, &(cfdata->imc.e_im_setup_exec), NULL, NULL, NULL);
e_widget_on_change_hook_set(ow, _e_imc_entry_change_cb, cfdata);
cfdata->gui.e_im_setup_exec = ow;
e_widget_frametable_object_append(of, ow, 1, 2, 1, 1, 1, 1, 1, 0);
@ -921,21 +921,21 @@ _advanced_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_
ow = e_widget_label_add(evas, "GTK_IM_MODULE");
e_widget_frametable_object_append(of, ow, 0, 0, 1, 1, 1, 1, 0, 0);
ow = e_widget_entry_add(evas, &(cfdata->imc.gtk_im_module), NULL, NULL, NULL);
ow = e_widget_entry_add(cfd->dia->win, &(cfdata->imc.gtk_im_module), NULL, NULL, NULL);
e_widget_on_change_hook_set(ow, _e_imc_entry_change_cb, cfdata);
cfdata->gui.gtk_im_module = ow;
e_widget_frametable_object_append(of, ow, 1, 0, 1, 1, 1, 1, 1, 0);
ow = e_widget_label_add(evas, "QT_IM_MODULE");
e_widget_frametable_object_append(of, ow, 0, 1, 1, 1, 1, 1, 0, 0);
ow = e_widget_entry_add(evas, &(cfdata->imc.qt_im_module), NULL, NULL, NULL);
ow = e_widget_entry_add(cfd->dia->win, &(cfdata->imc.qt_im_module), NULL, NULL, NULL);
e_widget_on_change_hook_set(ow, _e_imc_entry_change_cb, cfdata);
cfdata->gui.qt_im_module = ow;
e_widget_frametable_object_append(of, ow, 1, 1, 1, 1, 1, 1, 1, 0);
ow = e_widget_label_add(evas, "XMODIFIERS");
e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 1, 0, 0);
ow = e_widget_entry_add(evas, &(cfdata->imc.xmodifiers), NULL, NULL, NULL);
ow = e_widget_entry_add(cfd->dia->win, &(cfdata->imc.xmodifiers), NULL, NULL, NULL);
e_widget_on_change_hook_set(ow, _e_imc_entry_change_cb, cfdata);
cfdata->gui.xmodifiers = ow;
e_widget_frametable_object_append(of, ow, 1, 2, 1, 1, 1, 1, 1, 0);

8
src/modules/conf_intl/e_int_config_intl.c
Unescape View File

@ -1010,7 +1010,7 @@ _basic_advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data
}
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata)
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *of, *ob, *ic;
char *cur_sig_loc = NULL;
@ -1088,7 +1088,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
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), NULL, NULL, NULL);
ob = e_widget_entry_add(cfd->dia->win, &(cfdata->cur_language), NULL, NULL, NULL);
cfdata->gui.locale_entry = ob;
e_widget_entry_readonly_set(cfdata->gui.locale_entry, 1);
e_widget_size_min_set(cfdata->gui.locale_entry, 100, 25);
@ -1100,7 +1100,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
}
static Evas_Object *
_advanced_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata)
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *of, *ob;
const char *lang, *reg, *cs, *mod;
@ -1166,7 +1166,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_
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), NULL, NULL, NULL);
ob = e_widget_entry_add(cfd->dia->win, &(cfdata->cur_language), NULL, NULL, NULL);
cfdata->gui.locale_entry = ob;
e_widget_entry_readonly_set(cfdata->gui.locale_entry, 1);
e_widget_size_min_set(cfdata->gui.locale_entry, 100, 25);

6
src/modules/conf_paths/e_int_config_env.c
Unescape View File

@ -273,7 +273,7 @@ _unset_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata)
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ol, *oe, *ob, *oc;
Eina_List *l;
@ -295,11 +295,11 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
e_widget_size_min_set(ol, 200, 160);
e_widget_table_object_append(o, ol, 0, 0, 3, 1, 1, 1, 1, 1);
oe = e_widget_entry_add(evas, &(cfdata->var_str), NULL, NULL, NULL);
oe = e_widget_entry_add(cfd->dia->win, &(cfdata->var_str), NULL, NULL, NULL);
cfdata->gui.var_en = oe;
e_widget_table_object_append(o, oe, 0, 1, 1, 1, 1, 1, 1, 0);
oe = e_widget_entry_add(evas, &(cfdata->val_str), NULL, NULL, NULL);
oe = e_widget_entry_add(cfd->dia->win, &(cfdata->val_str), NULL, NULL, NULL);
cfdata->gui.val_en = oe;
e_widget_table_object_append(o, oe, 1, 1, 1, 1, 1, 1, 1, 0);

2
src/modules/connman/agent.c
Unescape View File

@ -186,7 +186,7 @@ _dialog_field_add(E_Connman_Agent *agent, struct Connman_Field *field)
input = E_NEW(E_Connman_Agent_Input, 1);
input->key = strdup(field->name);
entry = e_widget_entry_add(evas, &(input->value), NULL, NULL, NULL);
entry = e_widget_entry_add(agent->dialog->win, &(input->value), NULL, NULL, NULL);
evas_object_show(entry);
list = evas_object_data_get(toolbook, field->requirement);

2
src/modules/everything/evry_config.c
Unescape View File

@ -408,7 +408,7 @@ _create_plugin_page(E_Config_Dialog_Data *cfdata __UNUSED__, Evas *e, Plugin_Pag
e_widget_table_object_append(ob, of, 1, 0, 1, 1, 1, 1, 1, 0);
of = e_widget_framelist_add(e, _("Plugin Trigger"), 0);
o = e_widget_entry_add(e, &(page->trigger), NULL, NULL, NULL);
o = e_widget_entry_add(e_win_evas_win_get(e), &(page->trigger), NULL, NULL, NULL);
e_widget_disabled_set(o, 1);
page->o_trigger = o;
e_widget_framelist_object_append(of, o);

2
src/modules/everything/evry_gadget.c
Unescape View File

@ -667,7 +667,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdata)
o = e_widget_list_add(e, 0, 0);
of = e_widget_framelist_add(e, _("Plugin"), 0);
/* ow = e_widget_entry_add(e, &(cfdata->plugin), NULL, NULL, NULL);
/* ow = e_widget_entry_add(cfd->dia->win, &(cfdata->plugin), NULL, NULL, NULL);
* e_widget_framelist_object_append(of, ow); */
ow = e_widget_ilist_add(e, 24, 24, &cfdata->plugin);

6
src/modules/everything/evry_plug_apps.c
Unescape View File

@ -1325,7 +1325,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
}
static Evas_Object *