sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow multiple file filters to be separated by a space for

Browse Source 
consistency with Find in Files file patterns. ';' is still
allowed also.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5616 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2011-03-22 17:26:47 +00:00
parent 70005af1d6
commit f25e18d866
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -2,6 +2,10 @@
* src/main.c: * src/main.c:
Make --ft-names list filetypes alphabetically. Make --ft-names list filetypes alphabetically.
* plugins/filebrowser.c:
Allow multiple file filters to be separated by a space for
consistency with Find in Files file patterns. ';' is still
allowed also.
2011-03-20 Colomban Wendling <colomban(at)geany(dot)org> 2011-03-20 Colomban Wendling <colomban(at)geany(dot)org>

12
plugins/filebrowser.c
View File

@ -160,10 +160,10 @@ static gboolean check_filtered(const gchar *base_name)
{ {
gchar **filter_item; gchar **filter_item;
guint len; guint len;
if (filter == NULL) if (filter == NULL)
return FALSE; return FALSE;
len = g_strv_length(filter); len = g_strv_length(filter);
foreach_c_array(filter_item, filter, len) foreach_c_array(filter_item, filter, len)
{ {
@ -795,7 +795,9 @@ static void on_path_combo_changed(GtkComboBox *combo, gpointer user_data)
static void on_filter_activate(GtkEntry *entry, gpointer user_data) static void on_filter_activate(GtkEntry *entry, gpointer user_data)
{ {
filter = g_strsplit(gtk_entry_get_text(entry), ";", -1); /* We use spaces for consistency with Find in Files file patterns
* ';' also supported like original patch. */
filter = g_strsplit_set(gtk_entry_get_text(entry), "; ", -1);
if (filter == NULL || g_strv_length(filter) == 0) if (filter == NULL || g_strv_length(filter) == 0)
{ {
clear_filter(); clear_filter();
@ -911,7 +913,7 @@ static GtkWidget *make_filterbar(void)
g_signal_connect(filter_entry, "icon-release", G_CALLBACK(on_filter_clear), NULL); g_signal_connect(filter_entry, "icon-release", G_CALLBACK(on_filter_clear), NULL);
} }
ui_widget_set_tooltip_text(filter_entry, ui_widget_set_tooltip_text(filter_entry,
_("Filter your files with usual wildcards, separate multiple filters with \";\"")); _("Filter your files with the usual wildcards. Separate multiple patterns with a space."));
g_signal_connect(filter_entry, "activate", G_CALLBACK(on_filter_activate), NULL); g_signal_connect(filter_entry, "activate", G_CALLBACK(on_filter_activate), NULL);
gtk_box_pack_start(GTK_BOX(filterbar), label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(filterbar), label, FALSE, FALSE, 0);
@ -1095,7 +1097,7 @@ void plugin_init(GeanyData *data)
GtkWidget *scrollwin, *toolbar, *filterbar; GtkWidget *scrollwin, *toolbar, *filterbar;
filter = NULL; filter = NULL;
file_view_vbox = gtk_vbox_new(FALSE, 0); file_view_vbox = gtk_vbox_new(FALSE, 0);
toolbar = make_toolbar(); toolbar = make_toolbar();
gtk_box_pack_start(GTK_BOX(file_view_vbox), toolbar, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(file_view_vbox), toolbar, FALSE, FALSE, 0);