mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
updated for version 7.3.592
Problem: Vim on GTK does not support g:browsefilter. Solution: Add a GtkFileFilter to the file chooser. (Christian Brabandt)
This commit is contained in:
@@ -840,7 +840,7 @@ gui_mch_browse(int saving UNUSED,
|
|||||||
char_u *dflt,
|
char_u *dflt,
|
||||||
char_u *ext UNUSED,
|
char_u *ext UNUSED,
|
||||||
char_u *initdir,
|
char_u *initdir,
|
||||||
char_u *filter UNUSED)
|
char_u *filter)
|
||||||
{
|
{
|
||||||
#ifdef USE_FILE_CHOOSER
|
#ifdef USE_FILE_CHOOSER
|
||||||
GtkWidget *fc;
|
GtkWidget *fc;
|
||||||
@@ -848,6 +848,7 @@ gui_mch_browse(int saving UNUSED,
|
|||||||
char_u dirbuf[MAXPATHL];
|
char_u dirbuf[MAXPATHL];
|
||||||
guint log_handler;
|
guint log_handler;
|
||||||
const gchar *domain = "Gtk";
|
const gchar *domain = "Gtk";
|
||||||
|
GtkFileFilter *gfilter;
|
||||||
|
|
||||||
title = CONVERT_TO_UTF8(title);
|
title = CONVERT_TO_UTF8(title);
|
||||||
|
|
||||||
@@ -879,6 +880,45 @@ gui_mch_browse(int saving UNUSED,
|
|||||||
NULL);
|
NULL);
|
||||||
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(fc),
|
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(fc),
|
||||||
(const gchar *)dirbuf);
|
(const gchar *)dirbuf);
|
||||||
|
|
||||||
|
if (filter != NULL && *filter != NUL)
|
||||||
|
{
|
||||||
|
int i = 0;
|
||||||
|
char_u *patt;
|
||||||
|
char_u *p = filter;
|
||||||
|
|
||||||
|
gfilter = gtk_file_filter_new();
|
||||||
|
patt = alloc(STRLEN(filter));
|
||||||
|
while (p != NULL && *p != NUL)
|
||||||
|
{
|
||||||
|
if (*p == '\n' || *p == ';' || *p == '\t')
|
||||||
|
{
|
||||||
|
STRNCPY(patt, filter, i);
|
||||||
|
patt[i] = '\0';
|
||||||
|
if (*p == '\t')
|
||||||
|
gtk_file_filter_set_name(gfilter, (gchar *)patt);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
gtk_file_filter_add_pattern(gfilter, (gchar *)patt);
|
||||||
|
if (*p == '\n')
|
||||||
|
{
|
||||||
|
gtk_file_chooser_add_filter((GtkFileChooser *)fc,
|
||||||
|
gfilter);
|
||||||
|
if (*(p + 1) != NUL)
|
||||||
|
gfilter = gtk_file_filter_new();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
filter = ++p;
|
||||||
|
i = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
p++;
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
vim_free(patt);
|
||||||
|
}
|
||||||
if (saving && dflt != NULL && *dflt != NUL)
|
if (saving && dflt != NULL && *dflt != NUL)
|
||||||
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(fc), (char *)dflt);
|
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(fc), (char *)dflt);
|
||||||
|
|
||||||
|
@@ -714,6 +714,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
592,
|
||||||
/**/
|
/**/
|
||||||
591,
|
591,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user