Add pan filtering to all of the pan view modes

diff --git a/src/pan-view/pan-calendar.c b/src/pan-view/pan-calendar.c
index 91aa003..3400fbb 100644 (file)
--- a/src/pan-view/pan-calendar.c
+++ b/src/pan-view/pan-calendar.c
@@ -26,6 +26,7 @@
 
 #include "pan-util.h"
 #include "pan-view.h"
+#include "pan-view-filter.h"
 #include "pixbuf_util.h"
 
 #define PAN_CAL_POPUP_COLOR 220, 220, 220
@@ -200,6 +201,7 @@ void pan_calendar_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *he
        gint end_month = 0;
 
        list = pan_list_tree(dir_fd, SORT_NONE, TRUE, pw->ignore_symlinks);
+       pan_filter_fd_list(&list, pw->filter_ui->filter_elements);
 
        if (pw->cache_list && pw->exif_date_enable)
                {

diff --git a/src/pan-view/pan-folder.c b/src/pan-view/pan-folder.c
index 65ac306..95748ee 100644 (file)
--- a/src/pan-view/pan-folder.c
+++ b/src/pan-view/pan-folder.c
@@ -25,6 +25,7 @@
 
 #include "pan-item.h"
 #include "pan-util.h"
+#include "pan-view-filter.h"
 
 static void pan_flower_size(PanWindow *pw, gint *width, gint *height)
 {
@@ -242,6 +243,8 @@ static FlowerGroup *pan_flower_group(PanWindow *pw, FileData *dir_fd, gint x, gi
        f = filelist_sort(f, SORT_NAME, TRUE);
        d = filelist_sort(d, SORT_NAME, TRUE);
 
+       pan_filter_fd_list(&f, pw->filter_ui->filter_elements);
+
        pi_box = pan_item_text_new(pw, x, y, dir_fd->path, PAN_TEXT_ATTR_NONE,
                                   PAN_TEXT_BORDER_SIZE,
                                   PAN_TEXT_COLOR, 255);
@@ -386,6 +389,8 @@ static void pan_folder_tree_path(PanWindow *pw, FileData *dir_fd,
        f = filelist_sort(f, SORT_NAME, TRUE);
        d = filelist_sort(d, SORT_NAME, TRUE);
 
+       pan_filter_fd_list(&f, pw->filter_ui->filter_elements);
+
        *x = PAN_BOX_BORDER + ((*level) * MAX(PAN_BOX_BORDER, PAN_THUMB_GAP));
 
        pi_box = pan_item_text_new(pw, *x, *y, dir_fd->path, PAN_TEXT_ATTR_NONE,

diff --git a/src/pan-view/pan-grid.c b/src/pan-view/pan-grid.c
index b441b83..5d28e4b 100644 (file)
--- a/src/pan-view/pan-grid.c
+++ b/src/pan-view/pan-grid.c
@@ -25,6 +25,7 @@
 
 #include "pan-item.h"
 #include "pan-util.h"
+#include "pan-view-filter.h"
 
 void pan_grid_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *height)
 {
@@ -35,6 +36,7 @@ void pan_grid_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *height
        gint next_y;
 
        list = pan_list_tree(dir_fd, SORT_NAME, TRUE, pw->ignore_symlinks);
+       pan_filter_fd_list(&list, pw->filter_ui->filter_elements);
 
        grid_size = (gint)sqrt((gdouble)g_list_length(list));
        if (pw->size > PAN_IMAGE_SIZE_THUMB_LARGE)

diff --git a/src/pan-view/pan-timeline.c b/src/pan-view/pan-timeline.c
index 15ffd87..1162795 100644 (file)
--- a/src/pan-view/pan-timeline.c
+++ b/src/pan-view/pan-timeline.c
@@ -42,7 +42,7 @@ void pan_timeline_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *he
        gint y_height;
 
        list = pan_list_tree(dir_fd, SORT_NONE, TRUE, pw->ignore_symlinks);
-       gboolean changed = pan_filter_fd_list(&list, pw->filter_ui->filter_elements);
+       pan_filter_fd_list(&list, pw->filter_ui->filter_elements);
 
        if (pw->cache_list && pw->exif_date_enable)
                {