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

Ticket #1662: keep empty 'Content:' field in 'Find File' dialog.

Browse Source 
Partially revert of 5fd7d65dca.
If 'Content:' field is empty, keep it and don't populate it
from history.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Andrew Borodin 2009-10-04 18:27:43 +04:00
parent e5abe33fc6
commit 2d1eb7bea0
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/find.c
View File

@ -150,6 +150,7 @@ static struct {
{ N_("&Edit - F4"), 13, 38 } { N_("&Edit - F4"), 13, 38 }
}; };
static char *in_contents = NULL;
static char *in_start_dir = INPUT_LAST_TEXT; static char *in_start_dir = INPUT_LAST_TEXT;
static mc_search_t *search_file_handle = NULL; static mc_search_t *search_file_handle = NULL;
@ -316,6 +317,9 @@ find_parameters (char **start_dir, char **pattern, char **content)
b2 = str_term_width1 (buts[2]) + 4; b2 = str_term_width1 (buts[2]) + 4;
find_par_start: find_par_start:
if (in_contents == NULL)
in_contents = INPUT_LAST_TEXT;
if (in_start_dir == NULL) if (in_start_dir == NULL)
in_start_dir = g_strdup ("."); in_start_dir = g_strdup (".");
@ -365,7 +369,7 @@ find_parameters (char **start_dir, char **pattern, char **content)
file_case_sens_cbox = check_new (7, 3, file_case_sens_flag, file_case_label); file_case_sens_cbox = check_new (7, 3, file_case_sens_flag, file_case_label);
add_widget (find_dlg, file_case_sens_cbox); add_widget (find_dlg, file_case_sens_cbox);
in_with = input_new (6, FIND_X / 2 + 1, INPUT_COLOR, FIND_X / 2 - 4, INPUT_LAST_TEXT, in_with = input_new (6, FIND_X / 2 + 1, INPUT_COLOR, FIND_X / 2 - 4, in_contents,
MC_HISTORY_SHARED_SEARCH, INPUT_COMPLETE_DEFAULT); MC_HISTORY_SHARED_SEARCH, INPUT_COMPLETE_DEFAULT);
add_widget (find_dlg, in_with); add_widget (find_dlg, in_with);
add_widget (find_dlg, label_new (5, FIND_X / 2 + 1, _("Content:"))); add_widget (find_dlg, label_new (5, FIND_X / 2 + 1, _("Content:")));
@ -433,7 +437,16 @@ find_parameters (char **start_dir, char **pattern, char **content)
file_pattern_flag = file_pattern_cbox->state & C_BOOL; file_pattern_flag = file_pattern_cbox->state & C_BOOL;
file_case_sens_flag = file_case_sens_cbox->state & C_BOOL; file_case_sens_flag = file_case_sens_cbox->state & C_BOOL;
skip_hidden_flag = skip_hidden_cbox->state & C_BOOL; skip_hidden_flag = skip_hidden_cbox->state & C_BOOL;
*content = (in_with->buffer[0] != '\0') ? g_strdup (in_with->buffer) : NULL;
/* keep empty Content field */
/* if not empty, fill from history */
*content = NULL;
in_contents = "";
if (in_with->buffer[0] != '\0') {
*content = g_strdup (in_with->buffer);
in_contents = INPUT_LAST_TEXT;
}
*start_dir = g_strdup ((in_start->buffer[0] != '\0') ? in_start->buffer : "."); *start_dir = g_strdup ((in_start->buffer[0] != '\0') ? in_start->buffer : ".");
*pattern = g_strdup (in_name->buffer); *pattern = g_strdup (in_name->buffer);
if (in_start_dir != INPUT_LAST_TEXT) if (in_start_dir != INPUT_LAST_TEXT)