mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 18:14:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3924_find_file_remember_empty_content'

Browse Source 
* 3924_find_file_remember_empty_content:
  Ticket #3924: Find file: remember state (empty or not) of Content field.
This commit is contained in:
Andrew Borodin 2018-09-04 10:21:09 +03:00
commit faa893b683
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/filemanager/find.c
View File

@ -152,6 +152,7 @@ static char *find_pattern = NULL; /* Pattern to search */
static char *content_pattern = NULL; /* pattern to search inside files; if static char *content_pattern = NULL; /* pattern to search inside files; if
content_regexp_flag is true, it contains the content_regexp_flag is true, it contains the
regex pattern, else the search string. */ regex pattern, else the search string. */
static gboolean content_is_empty = TRUE; /* remember content field state; initially is empty */
static unsigned long matches; /* Number of matches */ static unsigned long matches; /* Number of matches */
static gboolean is_start = FALSE; /* Status of the start/stop toggle button */ static gboolean is_start = FALSE; /* Status of the start/stop toggle button */
static char *old_dir = NULL; static char *old_dir = NULL;
@ -447,15 +448,13 @@ find_toggle_enable_params (void)
static void static void
find_toggle_enable_content (void) find_toggle_enable_content (void)
{ {
gboolean disable = in_with->buffer[0] == '\0'; widget_disable (WIDGET (content_regexp_cbox), content_is_empty);
widget_disable (WIDGET (content_case_sens_cbox), content_is_empty);
widget_disable (WIDGET (content_regexp_cbox), disable);
widget_disable (WIDGET (content_case_sens_cbox), disable);
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
widget_disable (WIDGET (content_all_charsets_cbox), disable); widget_disable (WIDGET (content_all_charsets_cbox), content_is_empty);
#endif #endif
widget_disable (WIDGET (content_whole_words_cbox), disable); widget_disable (WIDGET (content_whole_words_cbox), content_is_empty);
widget_disable (WIDGET (content_first_hit_cbox), disable); widget_disable (WIDGET (content_first_hit_cbox), content_is_empty);
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -512,8 +511,7 @@ find_parm_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, voi
} }
/* check content regexp */ /* check content regexp */
if (content_regexp_cbox->state && (in_with->buffer[0] != '\0') if (content_regexp_cbox->state && !content_is_empty && !find_check_regexp (in_with->buffer))
&& !find_check_regexp (in_with->buffer))
{ {
/* Don't stop the dialog */ /* Don't stop the dialog */
widget_set_state (WIDGET (h), WST_ACTIVE, TRUE); widget_set_state (WIDGET (h), WST_ACTIVE, TRUE);
@ -528,7 +526,10 @@ find_parm_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, voi
if (h->current->data == in_name) if (h->current->data == in_name)
find_toggle_enable_params (); find_toggle_enable_params ();
else if (h->current->data == in_with) else if (h->current->data == in_with)
{
content_is_empty = in_with->buffer[0] == '\0';
find_toggle_enable_content (); find_toggle_enable_content ();
}
return MSG_HANDLED; return MSG_HANDLED;
case MSG_DRAW: case MSG_DRAW:
@ -709,7 +710,7 @@ find_parameters (char **start_dir, ssize_t * start_dir_len,
content_label = label_new (y2++, x2, content_content_label); content_label = label_new (y2++, x2, content_content_label);
add_widget (find_dlg, content_label); add_widget (find_dlg, content_label);
in_with = in_with =
input_new (y2++, x2, input_colors, cw, INPUT_LAST_TEXT, input_new (y2++, x2, input_colors, cw, content_is_empty ? "" : INPUT_LAST_TEXT,
MC_HISTORY_SHARED_SEARCH, INPUT_COMPLETE_NONE); MC_HISTORY_SHARED_SEARCH, INPUT_COMPLETE_NONE);
in_with->label = content_label; in_with->label = content_label;
add_widget (find_dlg, in_with); add_widget (find_dlg, in_with);
@ -814,7 +815,8 @@ find_parameters (char **start_dir, ssize_t * start_dir_len,
g_free (options.ignore_dirs); g_free (options.ignore_dirs);
options.ignore_dirs = g_strdup (in_ignore->buffer); options.ignore_dirs = g_strdup (in_ignore->buffer);
*content = in_with->buffer[0] != '\0' ? g_strdup (in_with->buffer) : NULL; content_is_empty = in_with->buffer[0] == '\0';
*content = content_is_empty ? NULL : g_strdup (in_with->buffer);
if (in_name->buffer[0] != '\0') if (in_name->buffer[0] != '\0')
*pattern = g_strdup (in_name->buffer); *pattern = g_strdup (in_name->buffer);
else else