enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

don't allow copying from password entry 

SVN revision: 29641
This commit is contained in:
rephorm 2007-04-22 05:51:35 +00:00 committed by rephorm
parent 186303e42c
commit ef8e3d10bf
1 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/bin/e_entry.c
View File

@ -374,38 +374,41 @@ _e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
sd->popup = e_menu_new(); sd->popup = e_menu_new();
e_menu_post_deactivate_callback_set(sd->popup, e_menu_post_deactivate_callback_set(sd->popup,
_e_entry_cb_menu_post, sd); _e_entry_cb_menu_post, sd);
if (selecting) if (selecting && sd->enabled)
{ {
if (sd->enabled) if (e_editable_text_length_get(sd->editable_object))
{ {
if (e_editable_text_length_get(sd->editable_object)) mi = e_menu_item_new(sd->popup);
{ e_menu_item_label_set(mi, _("Delete"));
mi = e_menu_item_new(sd->popup); e_menu_item_icon_edje_set(mi,
e_menu_item_label_set(mi, _("Delete")); e_theme_edje_file_get("base/theme/fileman",
e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/fileman", "e/fileman/button/delete"),
"e/fileman/button/delete"), "e/fileman/button/delete");
"e/fileman/button/delete"); e_menu_item_callback_set(mi, _e_entry_cb_delete, sd);
e_menu_item_callback_set(mi, _e_entry_cb_delete, sd);
mi = e_menu_item_new(sd->popup);
mi = e_menu_item_new(sd->popup); e_menu_item_separator_set(mi, 1);
e_menu_item_separator_set(mi, 1); }
}
if (!e_editable_password_get(sd->editable_object))
mi = e_menu_item_new(sd->popup); {
e_menu_item_label_set(mi, _("Cut")); mi = e_menu_item_new(sd->popup);
e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/fileman", e_menu_item_label_set(mi, _("Cut"));
"e/fileman/button/cut"), e_menu_item_icon_edje_set(mi,
"e/fileman/button/cut"); e_theme_edje_file_get("base/theme/fileman",
e_menu_item_callback_set(mi, _e_entry_cb_cut, sd); "e/fileman/button/cut"),
"e/fileman/button/cut");
e_menu_item_callback_set(mi, _e_entry_cb_cut, sd);
mi = e_menu_item_new(sd->popup); mi = e_menu_item_new(sd->popup);
e_menu_item_label_set(mi, _("Copy")); e_menu_item_label_set(mi, _("Copy"));
e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/fileman", e_menu_item_icon_edje_set(mi,
"e/fileman/button/copy"), e_theme_edje_file_get("base/theme/fileman",
"e/fileman/button/copy"); "e/fileman/button/copy"),
"e/fileman/button/copy");
e_menu_item_callback_set(mi, _e_entry_cb_copy, sd); e_menu_item_callback_set(mi, _e_entry_cb_copy, sd);
} }
} }
if (sd->enabled) if (sd->enabled)
{ {
@ -538,6 +541,8 @@ _e_entry_x_selection_update(Evas_Object *entry)
return; return;
editable = sd->editable_object; editable = sd->editable_object;
if (e_editable_password_get(editable)) return;
cursor_pos = e_editable_cursor_pos_get(editable); cursor_pos = e_editable_cursor_pos_get(editable);
selection_pos = e_editable_selection_pos_get(editable); selection_pos = e_editable_selection_pos_get(editable);
start_pos = (cursor_pos <= selection_pos) ? cursor_pos : selection_pos; start_pos = (cursor_pos <= selection_pos) ? cursor_pos : selection_pos;
@ -548,6 +553,7 @@ _e_entry_x_selection_update(Evas_Object *entry)
(!(text = e_editable_text_range_get(editable, start_pos, end_pos)))) (!(text = e_editable_text_range_get(editable, start_pos, end_pos))))
return; return;
ecore_x_selection_primary_set(win->evas_win, text, strlen(text) + 1); ecore_x_selection_primary_set(win->evas_win, text, strlen(text) + 1);
free(text); free(text);
} }
@ -669,7 +675,7 @@ _e_entry_key_down_windows(Evas_Object *entry, Evas_Event_Key_Down *event)
else if ((strcmp(event->keyname, "x") == 0) || else if ((strcmp(event->keyname, "x") == 0) ||
(strcmp(event->keyname, "c") == 0)) (strcmp(event->keyname, "c") == 0))
{ {
if (selecting) if (!e_editable_password_get(editable) && selecting)
{ {
range = e_editable_text_range_get(editable, start_pos, end_pos); range = e_editable_text_range_get(editable, start_pos, end_pos);
if (range) if (range)
@ -811,7 +817,7 @@ _e_entry_key_down_emacs(Evas_Object *entry, Evas_Event_Key_Down *event)
evas_key_modifier_is_set(event->modifiers, "Shift")) && evas_key_modifier_is_set(event->modifiers, "Shift")) &&
(strcmp(event->key, "w") == 0)) (strcmp(event->key, "w") == 0))
{ {
if (selecting) if (!e_editable_password_get(editable) && selecting)
{ {
range = e_editable_text_range_get(editable, start_pos, end_pos); range = e_editable_text_range_get(editable, start_pos, end_pos);
if (range) if (range)