1
1

select_flags: make member of panels_options_t.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Этот коммит содержится в:
Andrew Borodin 2014-06-27 14:50:37 +04:00
родитель 9e0328ea54
Коммит c1c8b8cdd9
4 изменённых файлов: 17 добавлений и 13 удалений

Просмотреть файл

@ -310,8 +310,6 @@ panel_field_t panel_fields[] = {
mc_fhl_t *mc_filehighlight = NULL;
int select_flags = SELECT_MATCH_CASE | SELECT_SHELL_PATTERNS;
extern int saving_setup;
/*** file scope macro definitions ****************************************************************/
@ -2418,9 +2416,9 @@ static void
panel_select_unselect_files (WPanel *panel, const char *title, const char *history_name,
gboolean do_select)
{
int files_only = (select_flags & SELECT_FILES_ONLY) != 0;
int case_sens = (select_flags & SELECT_MATCH_CASE) != 0;
int shell_patterns = (select_flags & SELECT_SHELL_PATTERNS) != 0;
int files_only = (panels_options.select_flags & SELECT_FILES_ONLY) != 0;
int case_sens = (panels_options.select_flags & SELECT_MATCH_CASE) != 0;
int shell_patterns = (panels_options.select_flags & SELECT_SHELL_PATTERNS) != 0;
char *reg_exp;
mc_search_t *search;
@ -2475,13 +2473,13 @@ panel_select_unselect_files (WPanel *panel, const char *title, const char *histo
g_free (reg_exp);
/* result flags */
select_flags = 0;
panels_options.select_flags = 0;
if (case_sens != 0)
select_flags |= SELECT_MATCH_CASE;
panels_options.select_flags |= SELECT_MATCH_CASE;
if (files_only != 0)
select_flags |= SELECT_FILES_ONLY;
panels_options.select_flags |= SELECT_FILES_ONLY;
if (shell_patterns != 0)
select_flags |= SELECT_SHELL_PATTERNS;
panels_options.select_flags |= SELECT_SHELL_PATTERNS;
}
/* --------------------------------------------------------------------------------------------- */

Просмотреть файл

@ -54,7 +54,7 @@ typedef enum
SELECT_FILES_ONLY = 1 << 0,
SELECT_MATCH_CASE = 1 << 1,
SELECT_SHELL_PATTERNS = 1 << 2
} select_flags_t;
} panel_select_flags_t;
/* run mode and params */

Просмотреть файл

@ -143,7 +143,8 @@ panels_options_t panels_options = {
.filetype_mode = TRUE,
.permission_mode = FALSE,
.qsearch_mode = QSEARCH_PANEL_CASE,
.torben_fj_mode = FALSE
.torben_fj_mode = FALSE,
.select_flags = SELECT_MATCH_CASE | SELECT_SHELL_PATTERNS
};
int easy_patterns = 1;
@ -362,7 +363,6 @@ static const struct
{ "mcview_remember_file_position", &mcview_remember_file_position },
{ "auto_fill_mkdir_name", &auto_fill_mkdir_name },
{ "copymove_persistent_attr", &setup_copymove_persistent_attr },
{ "select_flags", &select_flags },
{ NULL, NULL }
};
@ -1453,6 +1453,10 @@ panels_load_options (void)
panels_options.qsearch_mode = QSEARCH_PANEL_CASE;
else
panels_options.qsearch_mode = (qsearch_mode_t) qmode;
panels_options.select_flags =
mc_config_get_int (mc_main_config, CONFIG_PANELS_SECTION, "select_flags",
(int) panels_options.select_flags);
}
}
@ -1472,6 +1476,8 @@ panels_save_options (void)
mc_config_set_int (mc_main_config, CONFIG_PANELS_SECTION,
"quick_search_mode", (int) panels_options.qsearch_mode);
mc_config_set_int (mc_main_config, CONFIG_PANELS_SECTION,
"select_flags", (int) panels_options.select_flags);
}
/* --------------------------------------------------------------------------------------------- */

Просмотреть файл

@ -53,6 +53,7 @@ typedef struct
gboolean permission_mode; /* If TRUE, we use permission hilighting */
qsearch_mode_t qsearch_mode; /* Quick search mode */
gboolean torben_fj_mode; /* If TRUE, use some usability hacks by Torben */
panel_select_flags_t select_flags; /* Select/unselect file flags */
} panels_options_t;
typedef struct macro_action_t
@ -84,7 +85,6 @@ extern int clear_before_exec;
extern int auto_menu;
extern int drop_menus;
extern int verbose;
extern int select_flags;
extern int setup_copymove_persistent_attr;
extern int classic_progressbar;
extern int easy_patterns;