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
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
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 \
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 \
{
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);
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);
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));
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);
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;
+++ /dev/null
-#include "e.h"
-
-#define ENTRY_PART_NAME "e.text.text"
-
-typedef struct _E_Entry_Smart_Data E_Entry_Smart_Data;
-
-struct _E_Entry_Smart_Data
-{
- Evas_Object *entry_object;
- Evas_Object *scroll_object;
- E_Menu *popup;
- Ecore_Event_Handler *selection_handler;
-
- int min_width;
- int height;
- Evas_Coord theme_width;
- Evas_Coord theme_height;
- int preedit_start_pos;
- int preedit_end_pos;
- int changing;
- Eina_Bool enabled : 1;
- Eina_Bool noedit : 1;
- Eina_Bool focused : 1;
- Eina_Bool password_mode : 1;
-};
-
-/* local subsystem functions */
-#ifndef HAVE_WAYLAND_ONLY
-static Eina_Bool _e_entry_x_selection_notify_handler(void *data, int type, void *event);
-#endif
-
-static void _e_entry_x_selection_update(Evas_Object *entry);
-
-static void _e_entry_smart_add(Evas_Object *object);
-static void _e_entry_smart_del(Evas_Object *object);
-static void _e_entry_smart_move(Evas_Object *object, Evas_Coord x, Evas_Coord y);
-static void _e_entry_smart_resize(Evas_Object *object, Evas_Coord w, Evas_Coord h);
-static void _e_entry_smart_show(Evas_Object *object);
-static void _e_entry_smart_hide(Evas_Object *object);
-static void _e_entry_color_set(Evas_Object *object, int r, int g, int b, int a);
-static void _e_entry_clip_set(Evas_Object *object, Evas_Object *clip);
-static void _e_entry_clip_unset(Evas_Object *object);
-static void _e_entry_cb_menu_post(void *data, E_Menu *m);
-static void _e_entry_cb_cut(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _e_entry_cb_copy(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _e_entry_cb_paste(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _e_entry_cb_select_all(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _e_entry_cb_delete(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static void _entry_recalc_size(Evas_Object *object);
-/* local subsystem globals */
-static Evas_Smart *_e_entry_smart = NULL;
-static int _e_entry_smart_use = 0;
-
-/* externally accessible functions */
-
-/**
- * Creates a new entry object. An entry is a field where the user can type
- * single-line text.
- * Use the "changed" smart callback to know when the content of the entry is
- * changed
- *
- * @param evas the evas where the entry object should be added
- * @return Returns the new entry object
- */
-EAPI Evas_Object *
-e_entry_add(Evas *evas)
-{
- if (!_e_entry_smart)
- {
- static const Evas_Smart_Class sc =
- {
- "e_entry",
- EVAS_SMART_CLASS_VERSION,
- _e_entry_smart_add,
- _e_entry_smart_del,
- _e_entry_smart_move,
- _e_entry_smart_resize,
- _e_entry_smart_show,
- _e_entry_smart_hide,
- _e_entry_color_set,
- _e_entry_clip_set,
- _e_entry_clip_unset,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL
- };
- _e_entry_smart = evas_smart_class_new(&sc);
- _e_entry_smart_use = 0;
- }
-
- _e_entry_smart_use++;
- return evas_object_smart_add(evas, _e_entry_smart);
-}
-
-/**
- * Sets the text of the entry object
- *
- * @param entry an entry object
- * @param text the text to set
- */
-EAPI void
-e_entry_text_set(Evas_Object *entry, const char *_text)
-{
- E_Entry_Smart_Data *sd;
- char *text = NULL;
- const char *otext;
-
- if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();
- if ((!entry) || (!(sd = evas_object_smart_data_get(entry))))
- return;
-
- text = evas_textblock_text_utf8_to_markup(
- edje_object_part_object_get(sd->entry_object, ENTRY_PART_NAME),
- _text);
- otext = edje_object_part_text_get(sd->entry_object, ENTRY_PART_NAME);
- if ((text) && (otext) && (!strcmp(text, otext)))
- {
- free(text);
- return;
- }
- if ((!text) && (!otext)) return;
- edje_object_part_text_set(sd->entry_object, ENTRY_PART_NAME, text);
- sd->changing++;
- edje_object_message_signal_process(sd->entry_object);
- sd->changing--;
- evas_object_smart_callback_call(entry, "changed", NULL);
- free(text);
-
- edje_object_size_min_calc(sd->entry_object, &sd->min_width, &sd->height);
- _entry_recalc_size(entry);
-}
-
-/**
- * Gets the text of the entry object
- *
- * @param entry an entry object
- * @return Returns the text of the entry object
- */
-EAPI const char *
-e_entry_text_get(Evas_Object *entry)
-{
- E_Entry_Smart_Data *sd;
- static char *text = NULL;
-
- if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERR(NULL);
- if ((!entry) || (!(sd = evas_object_smart_data_get(entry))))
- return NULL;
-
- if (text)
- {
- E_FREE(text);
- }
- text = evas_textblock_text_markup_to_utf8(
- edje_object_part_object_get(sd->entry_object, ENTRY_PART_NAME),
- edje_object_part_text_get(sd->entry_object, ENTRY_PART_NAME));
- return text;
-}
-
-/**
- * Clears the entry object
- *
- * @param entry an entry object
- */
-EAPI void
-e_entry_clear(Evas_Object *entry)
-{
- if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();
- e_entry_text_set(entry, "");
-}
-
-/**
- * Selects all the text of the entry.
- *
- * @param entry an entry object
- */
-EAPI void
-e_entry_select_all(Evas_Object *entry)
-{
- E_Entry_Smart_Data *sd;
-
- if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();
- if ((!entry) || (!(sd = evas_object_smart_data_get(entry))))
- return;
-
- _e_entry_cb_select_all(sd, NULL, NULL);
-}
-
-/**
- * Sets whether or not the entry object is in password mode. In password mode,
- * the entry displays '*' instead of the characters
- *
- * @param entry an entry object
- * @param password_mode 1 to turn on password mode, 0 to turn it off
- */
-EAPI void
-e_entry_password_set(Evas_Object *entry, int password_mode)
-{
- E_Entry_Smart_Data *sd;
- Eina_Stringshare *text;
-
- if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();
- if ((!entry) || (!(sd = evas_object_smart_data_get(entry))))
- return;
- if (sd->password_mode == password_mode)
- return;
-
- text = eina_stringshare_add(
- edje_object_part_text_get(sd->entry_object, ENTRY_PART_NAME));
-
- sd->password_mode = !!password_mode;
- if (!sd->password_mode)
- e_theme_edje_object_set(sd->entry_object, "base/theme/widgets", "e/widgets/entry/text");
- else
- e_theme_edje_object_set(sd->entry_object, "base/theme/widgets", "e/widgets/entry/password");
-
- /* Set the text back. */
- if (text)
- {
- edje_object_part_text_set(sd->entry_object, ENTRY_PART_NAME, text);
- eina_stringshare_del(text);
- }
-
- /* FIXME: Some sort of an hack to fix focus. We should just have an "update
- * state" function that handles theme changes. */
- if (sd->focused)
- {
- sd->focused = EINA_FALSE;
- e_entry_focus(entry);
- }
-}
-
-/**
- * Gets the minimum size of the entry object
- *
- * @param entry an entry object
- * @param minw the location where to store the minimun width of the entry
- * @param minh the location where to store the minimun height of the entry
- */
-EAPI void
-e_entry_size_min_get(Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh)
-{
- E_Entry_Smart_Data *sd;
- int vw;
-
- if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();
- if ((!entry) || (!(sd = evas_object_smart_data_get(entry))))
- return;
-
- e_scrollframe_child_viewport_size_get(sd->scroll_object, &vw, NULL);
- if (minw) *minw = sd->theme_width + vw;
- if (minh) *minh = sd->theme_height + sd->height;
-}
-
-/**
- * Focuses the entry object. It will receives keyboard events and the user could
- * then type some text (the entry should also be enabled. The cursor and the
- * selection will be shown
- *
- * @param entry the entry to focus
- */
-EAPI void
-e_entry_focus(Evas_Object *entry)
-{
- E_Entry_Smart_Data *sd;
-
- if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();
- if ((!entry) || (!(sd = evas_object_smart_data_get(entry))))
- return;
- if (sd->focused)
- return;
-
- if ((sd->enabled) && (!sd->noedit))
- evas_object_focus_set(sd->entry_object, EINA_TRUE);
- edje_object_signal_emit(sd->entry_object, "e,state,focused", "e");
- edje_object_signal_emit(e_scrollframe_edje_object_get(sd->scroll_object), "e,state,focused", "e");
-
- edje_object_part_text_cursor_end_set(sd->entry_object, ENTRY_PART_NAME, EDJE_CURSOR_MAIN);
- if ((sd->enabled) && (!sd->noedit))
- edje_object_signal_emit(sd->entry_object, "e,action,show,cursor", "e");
- sd->focused = EINA_TRUE;
-}
-
-/**
- * Unfocuses the entry object. It will no longer receives keyboard events so
- * the user could no longer type some text. The cursor and the selection will
- * be hidden
- *
- * @param entry the entry object to unfocus
- */
-EAPI void
-e_entry_unfocus(Evas_Object *entry)
-{
- E_Entry_Smart_Data *sd;
-
- if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();
- if ((!entry) || (!(sd = evas_object_smart_data_get(entry))))
- return;
- if (!sd->focused)
- return;
-
- edje_object_signal_emit(sd->entry_object, "e,state,unfocused", "e");
- edje_object_signal_emit(e_scrollframe_edje_object_get(sd->scroll_object), "e,state,unfocused", "e");
- evas_object_focus_set(sd->entry_object, EINA_FALSE);
- edje_object_signal_emit(sd->entry_object, "e,action,hide,cursor", "e");
- sd->focused = EINA_FALSE;
-}
-
-/**
- * Enables the entry object: the user will be able to type text
- *
- * @param entry the entry object to enable
- */
-EAPI void
-e_entry_enable(Evas_Object *entry)
-{
- E_Entry_Smart_Data *sd;
-
- if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();
- if ((!entry) || (!(sd = evas_object_smart_data_get(entry))))
- return;
- if (sd->enabled)
- return;
-
- edje_object_signal_emit(e_scrollframe_edje_object_get(sd->scroll_object),
- "e,state,enabled", "e");
- edje_object_signal_emit(sd->entry_object, "e,state,enabled", "e");
- if (sd->focused)
- edje_object_signal_emit(sd->entry_object, "e,action,show,cursor", "e");
- sd->enabled = EINA_TRUE;
-}
-
-/**
- * Disables the entry object: the user won't be able to type anymore. Selection
- * will still be possible (to copy the text)
- *
- * @param entry the entry object to disable
- */
-EAPI void
-e_entry_disable(Evas_Object *entry)
-{
- E_Entry_Smart_Data *sd;
-
- if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();
- if ((!entry) || (!(sd = evas_object_smart_data_get(entry))))
- return;
- if (!sd->enabled)
- return;
-
- edje_object_signal_emit(e_scrollframe_edje_object_get(sd->scroll_object),
- "e,state,disabled", "e");
- edje_object_signal_emit(sd->entry_object, "e,state,disabled", "e");
- edje_object_signal_emit(sd->entry_object, "e,action,hide,cursor", "e");
- sd->enabled = EINA_FALSE;
-}
-
-/**
- * Enables the entry object: the user will be able to type text
- *
- * @param entry the entry object to enable
- */
-EAPI void
-e_entry_edit(Evas_Object *entry)
-{
- E_Entry_Smart_Data *sd;
-
- if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();
- if ((!entry) || (!(sd = evas_object_smart_data_get(entry))))
- return;
- if (!sd->noedit)
- return;
-
- sd->noedit = EINA_FALSE;
- edje_object_signal_emit(e_scrollframe_edje_object_get(sd->scroll_object),
- "e,state,edit", "e");
- edje_object_signal_emit(sd->entry_object, "e,state,edit", "e");
- if (sd->focused)
- {
- edje_object_signal_emit(sd->entry_object, "e,action,show,cursor", "e");
- evas_object_focus_set(sd->entry_object, EINA_TRUE);
- }
-}
-
-/**
- * Disables the entry object: the user won't be able to type anymore. Selection
- * will still be possible (to copy the text)
- *
- * @param entry the entry object to disable
- */
-EAPI void
-e_entry_noedit(Evas_Object *entry)
-{
- E_Entry_Smart_Data *sd;
-
- if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();
- if ((!entry) || (!(sd = evas_object_smart_data_get(entry))))
- return;
- if (sd->noedit)
- return;
-
- sd->noedit = EINA_TRUE;
- edje_object_signal_emit(e_scrollframe_edje_object_get(sd->scroll_object),
- "e,state,noedit", "e");
- edje_object_signal_emit(sd->entry_object, "e,state,noedit", "e");
- edje_object_signal_emit(sd->entry_object, "e,action,hide,cursor", "e");
-}
-
-/**
- * Disable right click menu for an entry
- */
-EAPI void
-e_entry_nomenu(Evas_Object *entry)
-{
- if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();
- evas_object_event_callback_del_full(entry, EVAS_CALLBACK_MOUSE_DOWN,
- _e_entry_mouse_down_cb, entry);
-}
-
-/* Private functions */
-
-static Eina_Bool
-_e_entry_is_empty(const Evas_Object *entry_edje)
-{
- const Evas_Object *tb;
- Evas_Textblock_Cursor *cur;
- Eina_Bool ret;
-
- /* It's a hack until we get the support suggested above. We just
- * create a cursor, point it to the begining, and then try to
- * advance it, if it can advance, the tb is not empty, otherwise it
- * is. */
- tb = edje_object_part_object_get(entry_edje, ENTRY_PART_NAME);
-
- cur = evas_object_textblock_cursor_new((Evas_Object *)tb);
- evas_textblock_cursor_pos_set(cur, 0);
- ret = evas_textblock_cursor_char_next(cur);
- evas_textblock_cursor_free(cur);
-
- return !ret;
-}
-
-/* Called when the entry object is pressed by the mouse */
-static void
-_e_entry_mouse_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
-{
- E_Entry_Smart_Data *sd;
- Evas_Event_Mouse_Down *event;
-
- if ((!obj) || (!(sd = evas_object_smart_data_get(obj))))
- return;
- if (!(event = event_info))
- return;
-
- if (event->button == 3)
- {
- E_Menu_Item *mi;
- Evas_Coord x, y;
- int s_enabled, s_selecting, s_passwd, s_empty;
-
- s_selecting = !!edje_object_part_text_selection_get(sd->entry_object, ENTRY_PART_NAME);
- s_enabled = sd->enabled;
- s_passwd = sd->password_mode;
- s_empty = _e_entry_is_empty(sd->entry_object);
-
- if (!s_selecting && !s_enabled && s_empty) return;
-
- ecore_evas_pointer_xy_get(e_util_comp_current_get()->ee, &x, &y);
-
- /* Popup a menu */
- sd->popup = e_menu_new();
- e_menu_post_deactivate_callback_set(sd->popup,
- _e_entry_cb_menu_post, sd);
- if (s_selecting)
- {
- if (s_enabled)
- {
- if (!sd->noedit)
- {
- mi = e_menu_item_new(sd->popup);
- e_menu_item_label_set(mi, _("Delete"));
- e_util_menu_item_theme_icon_set(mi, "edit-delete");
- e_menu_item_callback_set(mi, _e_entry_cb_delete, sd);
-
- mi = e_menu_item_new(sd->popup);
- e_menu_item_separator_set(mi, 1);
-
- if (!s_passwd)
- {
- mi = e_menu_item_new(sd->popup);
- e_menu_item_label_set(mi, _("Cut"));
- e_util_menu_item_theme_icon_set(mi, "edit-cut");
- e_menu_item_callback_set(mi, _e_entry_cb_cut, sd);
- }
- }
- }
- if (!s_passwd)
- {
- mi = e_menu_item_new(sd->popup);
- e_menu_item_label_set(mi, _("Copy"));
- e_util_menu_item_theme_icon_set(mi, "edit-copy");
- e_menu_item_callback_set(mi, _e_entry_cb_copy, sd);
- }
- }
- if (sd->enabled)
- {
- if (!sd->noedit)
- {
- mi = e_menu_item_new(sd->popup);
- e_menu_item_label_set(mi, _("Paste"));
- e_util_menu_item_theme_icon_set(mi, "edit-paste");
- e_menu_item_callback_set(mi, _e_entry_cb_paste, sd);
- }
- }
- if (!s_empty)
- {
- mi = e_menu_item_new(sd->popup);
- e_menu_item_separator_set(mi, 1);
-
- mi = e_menu_item_new(sd->popup);
- e_menu_item_label_set(mi, _("Select All"));
- e_util_menu_item_theme_icon_set(mi, "edit-select-all");
- e_menu_item_callback_set(mi, _e_entry_cb_select_all, sd);
- }
-
- e_menu_activate_mouse(sd->popup, e_util_zone_current_get(e_manager_current_get()),
- x, y, 1, 1,
- E_MENU_POP_DIRECTION_DOWN, event->timestamp);
- }
-}
-
-/* Called when the the "selection_notify" event is emitted */
-#ifndef HAVE_WAYLAND_ONLY
-static Eina_Bool
-_e_entry_x_selection_notify_handler(void *data, int type __UNUSED__, void *event)
-{
- Evas_Object *entry;
- E_Entry_Smart_Data *sd;
- Ecore_X_Event_Selection_Notify *ev;
-
- if ((!(entry = data)) || (!(sd = evas_object_smart_data_get(entry))))
- return EINA_TRUE;
- if (!sd->focused)
- return EINA_TRUE;
-
- ev = event;
- if (((ev->selection == ECORE_X_SELECTION_CLIPBOARD) ||
- (ev->selection == ECORE_X_SELECTION_PRIMARY)) &&
- (strcmp(ev->target, ECORE_X_SELECTION_TARGET_UTF8_STRING) == 0))
- {
- Ecore_X_Selection_Data_Text *text_data;
-
- text_data = ev->data;
- if ((text_data->data.content == ECORE_X_SELECTION_CONTENT_TEXT) &&
- (text_data->text))
- {
- char *txt = evas_textblock_text_utf8_to_markup(NULL, text_data->text);
- if (txt)
- {
- edje_object_part_text_user_insert(sd->entry_object,
- ENTRY_PART_NAME, txt);
- free(txt);
- }
- }
- }
- return ECORE_CALLBACK_PASS_ON;
-}
-#endif
-
-/* Updates the X selection with the selected text of the entry */
-static void
-_e_entry_x_selection_update(Evas_Object *entry)
-{
- E_Entry_Smart_Data *sd;
- Ecore_Window xwin;
- Evas_Object *win;
- E_Comp *c;
-
- if ((!entry) || (!(sd = evas_object_smart_data_get(entry))))
- return;
- if (!(win = e_win_evas_object_win_get(entry)))
- {
- xwin = e_grabinput_key_win_get();
- if (!xwin)
- {
- c = e_comp_util_evas_object_comp_get(sd->entry_object);
- if (!c) return;
- xwin = c->ee_win;
- }
- }
- else
- xwin = elm_win_window_id_get(win);
-
- if (sd->password_mode)
- return;
-
-#ifndef HAVE_WAYLAND_ONLY
- const char *text;
-
- text = edje_object_part_text_selection_get(sd->entry_object, ENTRY_PART_NAME);
- if (text)
- ecore_x_selection_primary_set(xwin, text, strlen(text) + 1);
-#endif
-}
-
-static void
-_entry_paste_request_signal_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
- const char *emission,
- const char *source EINA_UNUSED)
-{
- Ecore_Window xwin;
- Evas_Object *win;
- E_Comp *c;
-
- if (!(win = e_win_evas_object_win_get(data)))
- {
- xwin = e_grabinput_key_win_get();
- if (!xwin)
- {
- c = e_comp_util_evas_object_comp_get(data);
- if (!c) return;
- xwin = c->ee_win;
- }
- }
- else
- xwin = elm_win_window_id_get(win);
-
-#ifndef HAVE_WAYLAND_ONLY
- if (emission[sizeof("ntry,paste,request,")] == '1')
- {
- ecore_x_selection_primary_request(xwin,
- ECORE_X_SELECTION_TARGET_UTF8_STRING);
- }
- else
- {
- ecore_x_selection_clipboard_request(xwin,
- ECORE_X_SELECTION_TARGET_UTF8_STRING);
- }
-#else
- (void)emission;
-#endif
-}
-
-static void
-_entry_selection_changed_signal_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
- const char *emission EINA_UNUSED,
- const char *source EINA_UNUSED)
-{
- _e_entry_x_selection_update(data);
-}
-
-static void
-_entry_selection_all_signal_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
- const char *emission EINA_UNUSED,
- const char *source EINA_UNUSED)
-{
- e_entry_select_all(data);
-}
-
-static void
-_entry_copy_notify_signal_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
- const char *emission EINA_UNUSED,
- const char *source EINA_UNUSED)
-{
- E_Entry_Smart_Data *sd;
-
- if ((!data) || !(sd = evas_object_smart_data_get(data)))
- return;
-
- _e_entry_cb_copy(sd, NULL, NULL);
-}
-
-static void
-_entry_cut_notify_signal_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
- const char *emission EINA_UNUSED,
- const char *source EINA_UNUSED)
-{
- E_Entry_Smart_Data *sd;
-
- if ((!data) || !(sd = evas_object_smart_data_get(data)))
- return;
-
- _e_entry_cb_cut(sd, NULL, NULL);
-}
-
-static void
-_entry_recalc_size(Evas_Object *object)
-{
- E_Entry_Smart_Data *sd;
- Evas_Coord vw, vh, w, h, pw = 0, ph = 0;
-
- if ((!object) || !(sd = evas_object_smart_data_get(object)))
- return;
-
- e_scrollframe_child_viewport_size_get(sd->scroll_object, &vw, &vh);
- w = (sd->min_width < vw) ? vw : sd->min_width;
- h = (sd->height < vh) ? vh : sd->height;
- evas_object_geometry_get(sd->entry_object, NULL, NULL, &pw, &ph);
- if ((w == pw) && (h == ph)) return;
- evas_object_resize(sd->entry_object, w, h);
-
- {
- Evas_Coord cx, cy, cw, ch;
- edje_object_part_text_cursor_geometry_get(sd->entry_object,
- ENTRY_PART_NAME, &cx, &cy, &cw, &ch);
- e_scrollframe_child_region_show(sd->scroll_object, cx, cy, cw, ch);
- }
-}
-
-static void
-_entry_changed_signal_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
- const char *emission EINA_UNUSED,
- const char *source EINA_UNUSED)
-{
- Evas_Object *object = data;
- E_Entry_Smart_Data *sd;
-
- if ((!object) || !(sd = evas_object_smart_data_get(object)))
- return;
- if (sd->changing) return;
- evas_object_smart_callback_call(object, "changed", NULL);
- edje_object_size_min_calc(sd->entry_object, &sd->min_width, &sd->height);
- _entry_recalc_size(object);
-}
-
-static void
-_entry_cursor_changed_signal_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
- const char *emission EINA_UNUSED,
- const char *source EINA_UNUSED)
-{
- Evas_Object *object = data;
- E_Entry_Smart_Data *sd;
- Evas_Coord cx, cy, cw, ch;
-
- if ((!object) || !(sd = evas_object_smart_data_get(object)))
- return;
-
- edje_object_part_text_cursor_geometry_get(sd->entry_object, ENTRY_PART_NAME,
- &cx, &cy, &cw, &ch);
- e_scrollframe_child_region_show(sd->scroll_object, cx, cy, cw, ch);
-}
-
-/* Editable object's smart methods */
-
-static void
-_e_entry_smart_add(Evas_Object *object)
-{
- Evas *evas;
- E_Entry_Smart_Data *sd;
- Evas_Object *o;
-
- if ((!object) || !(evas = evas_object_evas_get(object)))
- return;
-
- sd = calloc(1, sizeof(E_Entry_Smart_Data));
- if (!sd) return;
-
- evas_object_smart_data_set(object, sd);
-
- sd->enabled = EINA_TRUE;
- sd->noedit = EINA_FALSE;
- sd->focused = EINA_FALSE;
-
- sd->scroll_object = e_scrollframe_add(evas);
- e_scrollframe_key_navigation_set(sd->scroll_object, EINA_FALSE);
- /* We need that, as currently mouse grabbing breaks if that's not set. That's
- * what you get when you have scrolling and selection in the same place.
- * We can just use selection for scrolling or fix the issue. The fix would
- * probably require using the ON_SCROLL flag instead of the ON_HOLD and
- * actually handle it correctly. */
- e_scrollframe_thumbscroll_force(sd->scroll_object, EINA_FALSE);
- evas_object_propagate_events_set(sd->scroll_object, EINA_TRUE);
- e_scrollframe_custom_theme_set(sd->scroll_object, "base/theme/widgets", "e/widgets/entry/scrollframe");
- edje_object_size_min_calc(e_scrollframe_edje_object_get(sd->scroll_object),
- &sd->theme_width, &sd->theme_height);
-
- evas_object_smart_member_add(sd->scroll_object, object);
- evas_object_show(sd->scroll_object);
-
- o = edje_object_add(evas);
- sd->entry_object = o;
- e_theme_edje_object_set(o, "base/theme/widgets", "e/widgets/entry/text");
- edje_object_size_min_calc(sd->entry_object, &sd->min_width, &sd->height);
- evas_object_propagate_events_set(sd->entry_object, EINA_TRUE);
-
- e_scrollframe_child_set(sd->scroll_object, sd->entry_object);
- evas_object_show(o);
-
- evas_object_event_callback_add(object, EVAS_CALLBACK_MOUSE_DOWN,
- _e_entry_mouse_down_cb, object);
- edje_object_signal_callback_add(sd->entry_object,
- "selection,changed", ENTRY_PART_NAME,
- _entry_selection_changed_signal_cb, object);
- edje_object_signal_callback_add(sd->entry_object,
- "entry,selection,all,request", ENTRY_PART_NAME,
- _entry_selection_all_signal_cb, object);
- edje_object_signal_callback_add(sd->entry_object,
- "entry,changed", ENTRY_PART_NAME,
- _entry_changed_signal_cb, object);
- edje_object_signal_callback_add(sd->entry_object,
- "entry,paste,request,*", ENTRY_PART_NAME,
- _entry_paste_request_signal_cb, object);
- edje_object_signal_callback_add(sd->entry_object,
- "entry,copy,notify", ENTRY_PART_NAME,
- _entry_copy_notify_signal_cb, object);
- edje_object_signal_callback_add(sd->entry_object,
- "entry,cut,notify", ENTRY_PART_NAME,
- _entry_cut_notify_signal_cb, object);
- edje_object_signal_callback_add(sd->entry_object,
- "cursor,changed", ENTRY_PART_NAME,
- _entry_cursor_changed_signal_cb, object);
-
- _entry_recalc_size(object);
-
-#ifndef HAVE_WAYLAND_ONLY
- sd->selection_handler =
- ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY,
- _e_entry_x_selection_notify_handler, object);
-#endif
-}
-
-static void
-_e_entry_smart_del(Evas_Object *object)
-{
- E_Entry_Smart_Data *sd;
-
- if ((!object) || !(sd = evas_object_smart_data_get(object)))
- return;
-
- evas_object_event_callback_del_full(object, EVAS_CALLBACK_MOUSE_DOWN,
- _e_entry_mouse_down_cb, object);
-
- edje_object_signal_callback_del_full(sd->entry_object,
- "selection,changed", ENTRY_PART_NAME,
- _entry_selection_changed_signal_cb, object);
- edje_object_signal_callback_del_full(sd->entry_object,
- "entry,selection,all,request", ENTRY_PART_NAME,
- _entry_selection_all_signal_cb, object);
- edje_object_signal_callback_del_full(sd->entry_object,
- "entry,changed", ENTRY_PART_NAME,
- _entry_changed_signal_cb, object);
- edje_object_signal_callback_del_full(sd->entry_object,
- "entry,paste,request,*", ENTRY_PART_NAME,
- _entry_paste_request_signal_cb, object);
- edje_object_signal_callback_del_full(sd->entry_object,
- "entry,copy,notify", ENTRY_PART_NAME,
- _entry_copy_notify_signal_cb, object);
- edje_object_signal_callback_del_full(sd->entry_object,
- "entry,cut,notify", ENTRY_PART_NAME,
- _entry_cut_notify_signal_cb, object);
- edje_object_signal_callback_del_full(sd->entry_object,
- "cursor,changed", ENTRY_PART_NAME,
- _entry_cursor_changed_signal_cb, object);
- if (sd->selection_handler)
- ecore_event_handler_del(sd->selection_handler);
- evas_object_del(sd->entry_object);
- free(sd);
-}
-
-static void
-_e_entry_smart_move(Evas_Object *object, Evas_Coord x, Evas_Coord y)
-{
- E_Entry_Smart_Data *sd;
-
- if ((!object) || !(sd = evas_object_smart_data_get(object)))
- return;
-
- evas_object_move(sd->scroll_object, x, y);
-}
-
-static void
-_e_entry_smart_resize(Evas_Object *object, Evas_Coord w, Evas_Coord h)
-{
- E_Entry_Smart_Data *sd;
-
- if ((!object) || !(sd = evas_object_smart_data_get(object)))
- return;
-
- evas_object_resize(sd->scroll_object, w, h);
-
- _entry_recalc_size(object);
-}
-
-static void
-_e_entry_smart_show(Evas_Object *object)
-{
- E_Entry_Smart_Data *sd;
-
- if ((!object) || !(sd = evas_object_smart_data_get(object)))
- return;
- evas_object_show(sd->scroll_object);
-}
-
-static void
-_e_entry_smart_hide(Evas_Object *object)
-{
- E_Entry_Smart_Data *sd;
-
- if ((!object) || !(sd = evas_object_smart_data_get(object)))
- return;
- evas_object_hide(sd->scroll_object);
-}
-
-static void
-_e_entry_color_set(Evas_Object *object, int r, int g, int b, int a)
-{
- E_Entry_Smart_Data *sd;
-
- if ((!object) || !(sd = evas_object_smart_data_get(object)))
- return;
- evas_object_color_set(sd->scroll_object, r, g, b, a);
-}
-
-static void
-_e_entry_clip_set(Evas_Object *object, Evas_Object *clip)
-{
- E_Entry_Smart_Data *sd;
-
- if ((!object) || !(sd = evas_object_smart_data_get(object)))
- return;
- evas_object_clip_set(sd->scroll_object, clip);
-}
-
-static void
-_e_entry_clip_unset(Evas_Object *object)
-{
- E_Entry_Smart_Data *sd;
-
- if ((!object) || !(sd = evas_object_smart_data_get(object)))
- return;
- evas_object_clip_unset(sd->scroll_object);
-}
-
-static void
-_e_entry_cb_menu_post(void *data, E_Menu *m __UNUSED__)
-{
- E_Entry_Smart_Data *sd = data;
-
- if (!sd) return;
- if (!sd->popup) return;
- e_object_del(E_OBJECT(sd->popup));
- sd->popup = NULL;
-}
-
-static void
-_e_entry_cb_cut(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
-{
- E_Entry_Smart_Data *sd = data;
- if (!sd) return;
- _e_entry_cb_copy(sd, NULL, NULL);
- if ((!sd->enabled) || (sd->noedit)) return;
- edje_object_part_text_user_insert(sd->entry_object, ENTRY_PART_NAME, "");
-}
-
-static void
-_e_entry_cb_copy(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
-{
- E_Entry_Smart_Data *sd = data;
- const char *range;
- Ecore_Window xwin;
- Evas_Object *win;
-
- if (!sd) return;
- range = edje_object_part_text_selection_get(sd->entry_object, ENTRY_PART_NAME);
- if (range)
- {
- win = e_win_evas_object_win_get(sd->entry_object);
- if (win) xwin = elm_win_window_id_get(win);
- else
- {
- xwin = e_grabinput_key_win_get();
- if (!xwin)
- {
- E_Comp *c;
-
- c = e_comp_util_evas_object_comp_get(sd->entry_object);
- if (!c) return;
- xwin = c->ee_win;
- }
- }
-#ifndef HAVE_WAYLAND_ONLY
- ecore_x_selection_clipboard_set(xwin, range, strlen(range) + 1);
-#endif
- }
-}
-
-static void
-_e_entry_cb_paste(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
-{
- E_Entry_Smart_Data *sd;
- Ecore_Window xwin;
- Evas_Object *win;
-
- sd = data;
- if (!sd) return;
- if ((!sd->enabled) || (sd->noedit)) return;
-
- win = e_win_evas_object_win_get(sd->entry_object);
- if (win) xwin = elm_win_window_id_get(win);
- else
- {
- xwin = e_grabinput_key_win_get();
- if (!xwin)
- {
- E_Comp *c;
-
- c = e_comp_util_evas_object_comp_get(sd->entry_object);
- if (!c) return;
- xwin = c->ee_win;
- }
- }
-#ifndef HAVE_WAYLAND_ONLY
- ecore_x_selection_clipboard_request(xwin, ECORE_X_SELECTION_TARGET_UTF8_STRING);
-#endif
-}
-
-static void
-_e_entry_cb_select_all(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
-{
- E_Entry_Smart_Data *sd;
-
- sd = data;
- if (!sd) return;
- edje_object_part_text_select_all(sd->entry_object, ENTRY_PART_NAME);
- _e_entry_x_selection_update(sd->entry_object);
-}
-
-static void
-_e_entry_cb_delete(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
-{
- E_Entry_Smart_Data *sd;
-
- sd = data;
- if (!sd) return;
- if ((!sd->enabled) || (sd->noedit)) return;
- edje_object_part_text_user_insert(sd->entry_object, ENTRY_PART_NAME, "");
-}
-
+++ /dev/null
-#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
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);
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
_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);
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);
{
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)
#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"
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); \
}
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;
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
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
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
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
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);
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) ||
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) ||
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)
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);
/* 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;
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);
#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);
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);
* @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);
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);
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;
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);
}
/**
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);
}
/**
if (!(entry) || (!(wd = e_widget_data_get(entry))))
return;
- e_entry_clear(wd->o_entry);
+ elm_object_text_set(wd->o_entry, NULL);
}
/**
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);
}
/**
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);
}
/**
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 */
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
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
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;
}
#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);
_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);
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); \
_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);
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); \
_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);
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);
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);
}
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;
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);
}
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;
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);
}
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;
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);
}
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;
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);
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);
}
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;
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);
}
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;
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);
}
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;
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,
}
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;
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);
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);
}
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;
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);
}
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;
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);
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;
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);
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);
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);
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);
}
static Evas_Object *
-_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *e, E_Config_Dialog_Data *cfdata)
+_basic_create(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o = NULL, *of = NULL, *ow = NULL;
of = e_widget_framelist_add(e, _("Commands"), 0);
ow = e_widget_label_add(e, _("Terminal Command"));
e_widget_framelist_object_append(of, ow);
- ow = e_widget_entry_add(e, &(cfdata->cmd_terminal), NULL, NULL, NULL);
+ ow = e_widget_entry_add(cfd->dia->win, &(cfdata->cmd_terminal), NULL, NULL, NULL);
e_widget_framelist_object_append(of, ow);
ow = e_widget_label_add(e, _("Sudo GUI"));
e_widget_framelist_object_append(of, ow);
- ow = e_widget_entry_add(e, &(cfdata->cmd_sudo), NULL, NULL, NULL);
+ ow = e_widget_entry_add(cfd->dia->win, &(cfdata->cmd_sudo), NULL, NULL, NULL);
e_widget_framelist_object_append(of, ow);
e_widget_list_object_append(o, of, 1, 1, 0.5);
o = e_widget_label_add(evas, _("Custom Command"));
e_widget_list_object_append(ol, o, 1, 0, 0.5);
- fad->o_entry = e_widget_entry_add(evas, &(fad->exec_cmd),
+ fad->o_entry = e_widget_entry_add(dia->win, &(fad->exec_cmd),
_e_fwin_cb_exec_cmd_changed, fad, NULL);
e_widget_list_object_append(ol, fad->o_entry, 1, 0, 0.5);
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, 0, 1);
- ob = e_widget_entry_add(evas, &(cfdata->mime), NULL, NULL, NULL);
+ ob = e_widget_entry_add(cfd->dia->win, &(cfdata->mime), NULL, NULL, NULL);
e_widget_entry_readonly_set(ob, 1);
e_widget_size_min_set(ob, 100, 1);
e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
}
static void
-_create_channel_editor(E_Dialog *dialog __UNUSED__, Evas *evas, E_Mixer_App_Dialog_Data *app)
+_create_channel_editor(E_Dialog *dialog, Evas *evas, E_Mixer_App_Dialog_Data *app)
{
struct e_mixer_app_ui_channel_editor *ui = &app->ui.channel_editor;
ui->label_card = e_widget_label_add(evas, _("Card:"));
- ui->card = e_widget_entry_add(evas, NULL, NULL, NULL, NULL);
+ ui->card = e_widget_entry_add(dialog->win, NULL, NULL, NULL, NULL);
e_widget_entry_readonly_set(ui->card, 1);
ui->label_channel = e_widget_label_add(evas, _("Channel:"));
- ui->channel = e_widget_entry_add(evas, NULL, NULL, NULL, NULL);
+ ui->channel = e_widget_entry_add(dialog->win, NULL, NULL, NULL, NULL);
e_widget_entry_readonly_set(ui->channel, 1);
ui->label_type = e_widget_label_add(evas, _("Type:"));
- ui->type = e_widget_entry_add(evas, NULL, NULL, NULL, NULL);
+ ui->type = e_widget_entry_add(dialog->win, NULL, NULL, NULL, NULL);
e_widget_entry_readonly_set(ui->type, 1);
ui->label_left = e_widget_label_add(evas, _("Left:"));
e_widget_check_checked_set(chk, ctxt->external_mixer_enabled);
e_widget_list_object_append(cfdata->ui.list, chk, 1, 1, 0.5);
- edit = e_widget_entry_add(evas, &ctxt->external_mixer_command, NULL, NULL, NULL);
+ edit = e_widget_entry_add(dialog->dia->win, &ctxt->external_mixer_command, NULL, NULL, NULL);
e_widget_list_object_append(cfdata->ui.list, edit, 1, 1, 0.5);
}
}
static Evas_Object *
-_cfg_widgets_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata)
+_cfg_widgets_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *list, *of, *ob;
E_Radio_Group *rg;
e_widget_list_object_append(list, of, 1, 0, 0.5);
of = e_widget_framelist_add(evas, _("Package Manager"), 0);
- ob = e_widget_entry_add(evas, &(cfdata->manager_command), NULL, NULL, NULL);
+ ob = e_widget_entry_add(cfd->dia->win, &(cfdata->manager_command), NULL, NULL, NULL);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(list, of, 1, 0, 0.5);
_("Screenshot is available at this location:"));
e_widget_list_object_append(ol, o, 0, 0, 0.5);
- o = e_widget_entry_add(evas_object_evas_get(dia->win), NULL, NULL, NULL, NULL);
+ o = e_widget_entry_add(dia->win, NULL, NULL, NULL, NULL);
o_entry = o;
e_widget_list_object_append(ol, o, 1, 0, 0.5);
projects / platform / upstream / enlightenment.git / commitdiff