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

Reorganized "Find File" checkboxes

Browse Source 
Made "Find recursively" and "Search for content" appear the
first, as they are completely logically independent and influence the
way the strings entered in the corresponding fields are used.

"Using shell patterns" and "Regular expression" come next, as
they set a similar property of the fields. Same goes for the "Case
sensitive" and "All charsets" group.

"Skip hidden" and the rest close the show up.

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Yury V. Zaytsev 2010-06-26 22:32:51 +02:00
parent b68bef2cb6
commit e07bb515f3
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/find.c
View File

@ -392,6 +392,8 @@ find_parameters (char **start_dir, char **pattern, char **content)
int b0, b1, b2; int b0, b1, b2;
int cbox_position;
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
{ {
int i = sizeof (buts) / sizeof (buts[0]); int i = sizeof (buts) / sizeof (buts[0]);
@ -434,49 +436,54 @@ find_parameters (char **start_dir, char **pattern, char **content)
add_widget (find_dlg, add_widget (find_dlg,
button_new (FIND_Y - 3, FIND_X / 4 - b0 / 2, B_ENTER, DEFPUSH_BUTTON, buts[0], 0)); button_new (FIND_Y - 3, FIND_X / 4 - b0 / 2, B_ENTER, DEFPUSH_BUTTON, buts[0], 0));
cbox_position = FIND_Y - 5;
content_first_hit_cbox =
check_new (cbox_position--, FIND_X / 2 + 1, options.content_first_hit, content_first_hit_label);
widget_disable (content_first_hit_cbox->widget, disable);
add_widget (find_dlg, content_first_hit_cbox);
content_whole_words_cbox =
check_new (cbox_position--, FIND_X / 2 + 1, options.content_whole_words, content_whole_words_label);
add_widget (find_dlg, content_whole_words_cbox);
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
content_all_charsets_cbox = check_new (12, FIND_X / 2 + 1, content_all_charsets_cbox = check_new (cbox_position--, FIND_X / 2 + 1,
options.content_all_charsets, options.content_all_charsets,
content_all_charsets_label); content_all_charsets_label);
add_widget (find_dlg, content_all_charsets_cbox); add_widget (find_dlg, content_all_charsets_cbox);
#endif #endif
content_whole_words_cbox =
check_new (11, FIND_X / 2 + 1, options.content_whole_words, content_whole_words_label);
add_widget (find_dlg, content_whole_words_cbox);
content_first_hit_cbox =
check_new (10, FIND_X / 2 + 1, options.content_first_hit, content_first_hit_label);
add_widget (find_dlg, content_first_hit_cbox);
content_regexp_cbox =
check_new (9, FIND_X / 2 + 1, options.content_regexp, content_regexp_label);
add_widget (find_dlg, content_regexp_cbox);
content_case_sens_cbox = content_case_sens_cbox =
check_new (8, FIND_X / 2 + 1, options.content_case_sens, content_case_label); check_new (cbox_position--, FIND_X / 2 + 1, options.content_case_sens, content_case_label);
add_widget (find_dlg, content_case_sens_cbox); add_widget (find_dlg, content_case_sens_cbox);
content_use_cbox = content_regexp_cbox =
check_new (7, FIND_X / 2 + 1, options.content_use, content_use_label); check_new (cbox_position--, FIND_X / 2 + 1, options.content_regexp, content_regexp_label);
add_widget (find_dlg, content_use_cbox); add_widget (find_dlg, content_regexp_cbox);
cbox_position = FIND_Y - 6;
skip_hidden_cbox = check_new (cbox_position--, 3, options.skip_hidden, file_skip_hidden_label);
add_widget (find_dlg, skip_hidden_cbox);
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
file_all_charsets_cbox = check_new (11, 3, options.file_all_charsets, file_all_charsets_label); file_all_charsets_cbox = check_new (cbox_position--, 3, options.file_all_charsets, file_all_charsets_label);
add_widget (find_dlg, file_all_charsets_cbox); add_widget (find_dlg, file_all_charsets_cbox);
#endif #endif
skip_hidden_cbox = check_new (10, 3, options.skip_hidden, file_skip_hidden_label); file_case_sens_cbox = check_new (cbox_position--, 3, options.file_case_sens, file_case_label);
add_widget (find_dlg, skip_hidden_cbox); add_widget (find_dlg, file_case_sens_cbox);
recursively_cbox = check_new (9, 3, options.find_recurs, file_recurs_label); file_pattern_cbox = check_new (cbox_position--, 3, options.file_pattern, file_pattern_label);
add_widget (find_dlg, recursively_cbox);
file_pattern_cbox = check_new (8, 3, options.file_pattern, file_pattern_label);
add_widget (find_dlg, file_pattern_cbox); add_widget (find_dlg, file_pattern_cbox);
file_case_sens_cbox = check_new (7, 3, options.file_case_sens, file_case_label); recursively_cbox = check_new (cbox_position, 3, options.find_recurs, file_recurs_label);
add_widget (find_dlg, file_case_sens_cbox); add_widget (find_dlg, recursively_cbox);
/* This checkbox is located in the second column */
content_use_cbox = check_new (cbox_position, FIND_X / 2 + 1, options.content_use, content_use_label);
add_widget (find_dlg, content_use_cbox);
in_with = input_new (6, FIND_X / 2 + 1, input_get_default_colors(), FIND_X / 2 - 4, INPUT_LAST_TEXT, in_with = input_new (6, FIND_X / 2 + 1, input_get_default_colors(), FIND_X / 2 - 4, INPUT_LAST_TEXT,
MC_HISTORY_SHARED_SEARCH, INPUT_COMPLETE_DEFAULT); MC_HISTORY_SHARED_SEARCH, INPUT_COMPLETE_DEFAULT);
@ -533,7 +540,6 @@ find_parameters (char **start_dir, char **pattern, char **content)
in_start_dir = g_strdup (temp_dir); in_start_dir = g_strdup (temp_dir);
/* Warning: Dreadful goto */ /* Warning: Dreadful goto */
goto find_par_start; goto find_par_start;
break;
} }
default: default: