Ticket #2022 (case sensitive quick search)
added new option quick_search_case_sensitive, with 3 position are: 0, 1, 2. if "0", quick search in case insensitive if "1", quick search in case sensitive if "2", get from panel "case_sensitive" Signed-off-by: Ilia Maslakov <il.smind@gmail.com> Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Этот коммит содержится в:
родитель
7e72349152
Коммит
0400e92fc5
@ -44,6 +44,8 @@ extern int mouse_move_pages;
|
||||
|
||||
extern int option_tab_spacing;
|
||||
|
||||
extern int quick_search_case_sensitive;
|
||||
|
||||
#ifdef HAVE_CHARSET
|
||||
extern int source_codepage;
|
||||
extern int default_source_codepage;
|
||||
|
22
src/screen.c
22
src/screen.c
@ -89,6 +89,14 @@ typedef struct format_e
|
||||
const char *id;
|
||||
} format_e;
|
||||
|
||||
enum {
|
||||
QSEARCH_CASE_INSENSITIVE = 0, /* quick search in case insensitive mode */
|
||||
QSEARCH_CASE_SENSITIVE = 1, /* quick search in case sensitive mode */
|
||||
QSEARCH_PANEL_CASE = 2 /* quick search get value from panel case_sensitive */
|
||||
};
|
||||
|
||||
int quick_search_case_sensitive = QSEARCH_PANEL_CASE;
|
||||
|
||||
/* If true, show the mini-info on the panel */
|
||||
int show_mini_info = 1;
|
||||
|
||||
@ -2403,8 +2411,18 @@ do_search (WPanel * panel, int c_code)
|
||||
search = mc_search_new (esc_str, -1);
|
||||
search->search_type = MC_SEARCH_T_GLOB;
|
||||
search->is_entire_line = TRUE;
|
||||
search->is_case_sentitive = 0;
|
||||
|
||||
switch (quick_search_case_sensitive)
|
||||
{
|
||||
case QSEARCH_CASE_SENSITIVE:
|
||||
search->is_case_sentitive = TRUE;
|
||||
break;
|
||||
case QSEARCH_CASE_INSENSITIVE:
|
||||
search->is_case_sentitive = FALSE;
|
||||
break;
|
||||
default:
|
||||
search->is_case_sentitive = panel->case_sensitive;
|
||||
break;
|
||||
}
|
||||
sel = panel->selected;
|
||||
for (i = panel->selected; !wrapped || i != panel->selected; i++)
|
||||
{
|
||||
|
@ -232,6 +232,7 @@ static const struct {
|
||||
{ "reverse_files_only", &reverse_files_only },
|
||||
{ "copymove_persistent_attr", &setup_copymove_persistent_attr },
|
||||
{ "select_flags", &select_flags },
|
||||
{ "quick_search_case_sensitive", &quick_search_case_sensitive },
|
||||
{ 0, 0 }
|
||||
};
|
||||
/* *INDENT-ON* */
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user