enlightenment/edi
enlightenment
/
edi
8
1
Fork 3
Code Issues Pull Requests Projects Releases Wiki Activity

search: Use a search entry. 

Using a popup for project search isn't very intuitive. Let's
allow user input and/or a button click to determine when to
start and stop the search.
This commit is contained in:
Alastair Poole 2020-02-02 20:54:06 +00:00
parent ef7f2495e1
commit 78e5242f62
3 changed files with 100 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/edi_main.c
View File

@ -1040,7 +1040,7 @@ static void
_edi_menu_find_project_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
edi_mainview_project_search_popup_show();
edi_searchpanel_show();
}
static void

103
src/bin/edi_searchpanel.c
View File

@ -16,7 +16,7 @@
#include "edi_private.h"
static Evas_Object *_info_widget, *_tasks_widget;
static Evas_Object *_info_widget, *_tasks_widget, *_button_search;
static Elm_Code *_elm_code, *_tasks_code;
static Ecore_Thread *_search_thread = NULL;
@ -40,6 +40,64 @@ edi_searchpanel_stop(void)
ecore_thread_cancel(_search_thread);
}
static void
_edi_searchpanel_keypress_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info)
{
Evas_Object *entry;
Evas_Event_Key_Down *event;
const char *text_markup;
char *text;
event = event_info;
entry = obj;
if (!event) return;
if (!event->key) return;
if (!strcmp(event->key, "Return"))
{
edi_searchpanel_stop();
text_markup = elm_object_part_text_get(entry, NULL);
text = elm_entry_markup_to_utf8(text_markup);
if (text)
{
edi_searchpanel_find(text);
free(text);
}
elm_object_part_text_set(entry, NULL, "");
}
}
static void
_edi_searchpanel_button_clicked_cb(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
const char *text_markup;
char *text;
Evas_Object *button, *entry;
button = obj;
entry = data;
if (_search_thread)
{
edi_searchpanel_stop();
}
else
{
text_markup = elm_object_part_text_get(entry, NULL);
text = elm_entry_markup_to_utf8(text_markup);
if (text)
{
edi_searchpanel_find(text);
free(text);
}
elm_object_part_text_set(entry, NULL, "");
}
}
static void
_edi_searchpanel_line_clicked_cb(void *data EINA_UNUSED, const Efl_Event *event)
{
@ -505,7 +563,7 @@ _edi_searchpanel_search_project(const char *directory, const char *search_term,
{
case EINA_FILE_REG:
{
if (ecore_thread_check(_search_thread)) return;
if (ecore_thread_check(_search_thread)) return;
const char *mime = edi_mime_type_get(info->path);
@ -548,6 +606,8 @@ _search_end_cb(void *data EINA_UNUSED, Ecore_Thread *thread EINA_UNUSED)
len = strlen(text);
elm_object_text_set(_button_search, _("Search"));
elm_code_file_line_append(_elm_code->file, text, len, NULL);
_search_thread = NULL;
@ -581,6 +641,7 @@ edi_searchpanel_find(const char *text)
path = edi_project_get();
elm_code_file_clear(_elm_code->file);
elm_object_text_set(_button_search, _("Cancel"));
_searching = EINA_TRUE;
_search_thread = ecore_thread_feedback_run(_search_begin_cb, NULL,
@ -591,7 +652,7 @@ edi_searchpanel_find(const char *text)
void
edi_searchpanel_add(Evas_Object *parent)
{
Evas_Object *frame;
Evas_Object *frame, *entry, *box, *hbox, *button;
Elm_Code_Widget *widget;
Elm_Code *code;
@ -601,6 +662,34 @@ edi_searchpanel_add(Evas_Object *parent)
evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(frame);
box = elm_box_add(parent);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(box);
hbox = elm_box_add(parent);
evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_horizontal_set(hbox, EINA_TRUE);
evas_object_show(hbox);
entry = elm_entry_add(parent);
elm_entry_single_line_set(entry, EINA_TRUE);
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_editable_set(entry, EINA_TRUE);
evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_event_callback_add(entry, EVAS_CALLBACK_KEY_DOWN, _edi_searchpanel_keypress_cb, NULL);
evas_object_show(entry);
_button_search = button = elm_button_add(parent);
evas_object_size_hint_weight_set(button, 0.05, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(button, _("Search"));
elm_box_horizontal_set(button, EINA_TRUE);
evas_object_smart_callback_add(button, "clicked", _edi_searchpanel_button_clicked_cb, entry);
evas_object_show(button);
code = elm_code_create();
widget = elm_code_widget_add(parent, code);
edi_theme_elm_code_set(widget, _edi_project_config->gui.theme);
@ -615,7 +704,13 @@ edi_searchpanel_add(Evas_Object *parent)
_info_widget = widget;
eina_spinlock_new(&logs_lock);
elm_object_content_set(frame, widget);
elm_box_pack_end(hbox, entry);
elm_box_pack_end(hbox, button);
elm_box_pack_end(box, widget);
elm_box_pack_end(box, hbox);
elm_object_content_set(frame, box);
elm_box_pack_end(parent, frame);
ecore_event_handler_add(EDI_EVENT_CONFIG_CHANGED, _edi_searchpanel_config_changed_cb, NULL);

86
src/bin/mainview/edi_mainview.c
View File

@ -581,92 +581,6 @@ _edi_mainview_project_search_popup_cancel_cb(void *data EINA_UNUSED,
evas_object_del(_edi_mainview_search_project_popup);
}
static void
_edi_mainview_project_search_cb(void *data,
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
const char *text_markup;
char *text;
text_markup = elm_object_text_get((Evas_Object *) data);
if (!text_markup || !text_markup[0])
{
elm_object_focus_set((Evas_Object *)data, EINA_TRUE);
return;
}
text = elm_entry_markup_to_utf8(text_markup);
edi_searchpanel_show();
edi_searchpanel_find(text);
free(text);
evas_object_del(_edi_mainview_search_project_popup);
}
static void
_edi_mainview_project_search_popup_key_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
Evas_Object *obj, void *event_info)
{
Evas_Event_Key_Up *ev = (Evas_Event_Key_Up *)event_info;
const char *str;
str = elm_object_text_get(obj);
if (strlen(str) && (!strcmp(ev->key, "KP_Enter") || !strcmp(ev->key, "Return")))
_edi_mainview_project_search_cb(obj, NULL, NULL);
}
void
edi_mainview_project_search_popup_show(void)
{
Evas_Object *popup, *frame, *box, *input, *button, *label;
popup = elm_popup_add(_main_win);
_edi_mainview_search_project_popup = popup;
elm_object_part_text_set(popup, "title,text",
_("Search for (whole project)"));
box = elm_box_add(popup);
evas_object_show(box);
label = elm_label_add(popup);
elm_object_text_set(label, _("Please enter a term to search for within<br> the whole project.<br>"));
evas_object_show(label);
elm_box_pack_end(box, label);
input = elm_entry_add(box);
elm_entry_single_line_set(input, EINA_TRUE);
elm_entry_editable_set(input, EINA_TRUE);
elm_entry_scrollable_set(input, EINA_TRUE);
evas_object_size_hint_weight_set(input, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(input, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_event_callback_add(input, EVAS_CALLBACK_KEY_UP, _edi_mainview_project_search_popup_key_up_cb, NULL);
evas_object_show(input);
elm_box_pack_end(box, input);
evas_object_show(box);
frame = elm_frame_add(popup);
evas_object_show(frame);
elm_object_content_set(frame, box);
elm_object_content_set(popup, frame);
button = elm_button_add(popup);
elm_object_text_set(button, _("Cancel"));
elm_object_part_content_set(popup, "button1", button);
evas_object_smart_callback_add(button, "clicked",
_edi_mainview_project_search_popup_cancel_cb, NULL);
button = elm_button_add(popup);
elm_object_text_set(button, _("Search"));
elm_object_part_content_set(popup, "button2", button);
evas_object_smart_callback_add(button, "clicked",
_edi_mainview_project_search_cb, input);
evas_object_show(popup);
elm_object_focus_set(input, EINA_TRUE);
}
static void
_edi_mainview_project_replace_cb(void *data,
Evas_Object *obj,