File filter - include Clear icon
[geeqie.git] / src / view_file / view_file.c
index c4da36b..46d823d 100644 (file)
 #include "collect.h"
 #include "collect-table.h"
 #include "editors.h"
+#include "history_list.h"
 #include "layout.h"
 #include "menu.h"
+#include "misc.h"
+#include "pixbuf_util.h"
 #include "thumb.h"
 #include "ui_menu.h"
 #include "ui_fileops.h"
@@ -75,11 +78,16 @@ FileData *vf_index_get_data(ViewFile *vf, gint row)
 
 gint vf_index_by_fd(ViewFile *vf, FileData *fd)
 {
+       gint ret;
+
        switch (vf->type)
        {
-       case FILEVIEW_LIST: return vflist_index_by_fd(vf, fd);
-       case FILEVIEW_ICON: return vficon_index_by_fd(vf, fd);
+       case FILEVIEW_LIST: ret = vflist_index_by_fd(vf, fd); break;
+       case FILEVIEW_ICON: ret = vficon_index_by_fd(vf, fd); break;
+       default: ret = 0;
        }
+
+       return ret;
 }
 
 guint vf_count(ViewFile *vf, gint64 *bytes)
@@ -126,12 +134,16 @@ GList *vf_get_list(ViewFile *vf)
 static gboolean vf_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
        ViewFile *vf = data;
+       gboolean ret;
 
        switch (vf->type)
        {
-       case FILEVIEW_LIST: return vflist_press_key_cb(widget, event, data);
-       case FILEVIEW_ICON: return vficon_press_key_cb(widget, event, data);
+       case FILEVIEW_LIST: ret = vflist_press_key_cb(widget, event, data); break;
+       case FILEVIEW_ICON: ret = vficon_press_key_cb(widget, event, data); break;
+       default: ret = FALSE;
        }
+
+       return ret;
 }
 
 /*
@@ -143,23 +155,31 @@ static gboolean vf_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer
 static gboolean vf_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 {
        ViewFile *vf = data;
+       gboolean ret;
 
        switch (vf->type)
        {
-       case FILEVIEW_LIST: return vflist_press_cb(widget, bevent, data);
-       case FILEVIEW_ICON: return vficon_press_cb(widget, bevent, data);
+       case FILEVIEW_LIST: ret = vflist_press_cb(widget, bevent, data); break;
+       case FILEVIEW_ICON: ret = vficon_press_cb(widget, bevent, data); break;
+       default: ret = FALSE;
        }
+
+       return ret;
 }
 
 static gboolean vf_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 {
        ViewFile *vf = data;
+       gboolean ret;
 
        switch (vf->type)
        {
-       case FILEVIEW_LIST: return vflist_release_cb(widget, bevent, data);
-       case FILEVIEW_ICON: return vficon_release_cb(widget, bevent, data);
+       case FILEVIEW_LIST: ret = vflist_release_cb(widget, bevent, data); break;
+       case FILEVIEW_ICON: ret = vficon_release_cb(widget, bevent, data); break;
+       default: ret = FALSE;
        }
+
+       return ret;
 }
 
 
@@ -169,41 +189,46 @@ static gboolean vf_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointe
  *-----------------------------------------------------------------------------
  */
 
-gboolean vf_index_is_selected(ViewFile *vf, gint row)
-{
-       switch (vf->type)
-       {
-       case FILEVIEW_LIST: return vflist_index_is_selected(vf, row);
-       case FILEVIEW_ICON: return vficon_index_is_selected(vf, row);
-       }
-}
-
-
 guint vf_selection_count(ViewFile *vf, gint64 *bytes)
 {
+       guint ret;
+
        switch (vf->type)
        {
-       case FILEVIEW_LIST: return vflist_selection_count(vf, bytes);
-       case FILEVIEW_ICON: return vficon_selection_count(vf, bytes);
+       case FILEVIEW_LIST: ret = vflist_selection_count(vf, bytes); break;
+       case FILEVIEW_ICON: ret = vficon_selection_count(vf, bytes); break;
+       default: ret = 0;
        }
+
+       return ret;
 }
 
 GList *vf_selection_get_list(ViewFile *vf)
 {
+       GList *ret;
+
        switch (vf->type)
        {
-       case FILEVIEW_LIST: return vflist_selection_get_list(vf);
-       case FILEVIEW_ICON: return vficon_selection_get_list(vf);
+       case FILEVIEW_LIST: ret = vflist_selection_get_list(vf); break;
+       case FILEVIEW_ICON: ret = vficon_selection_get_list(vf); break;
+       default: ret = NULL;
        }
+
+       return ret;
 }
 
 GList *vf_selection_get_list_by_index(ViewFile *vf)
 {
+       GList *ret;
+
        switch (vf->type)
        {
-       case FILEVIEW_LIST: return vflist_selection_get_list_by_index(vf);
-       case FILEVIEW_ICON: return vficon_selection_get_list_by_index(vf);
+       case FILEVIEW_LIST: ret = vflist_selection_get_list_by_index(vf); break;
+       case FILEVIEW_ICON: ret = vficon_selection_get_list_by_index(vf); break;
+       default: ret = NULL;
        }
+
+       return ret;
 }
 
 void vf_select_all(ViewFile *vf)
@@ -242,6 +267,15 @@ void vf_select_by_fd(ViewFile *vf, FileData *fd)
        }
 }
 
+void vf_select_list(ViewFile *vf, GList *list)
+{
+       switch (vf->type)
+       {
+       case FILEVIEW_LIST: vflist_select_list(vf, list); break;
+       case FILEVIEW_ICON: vficon_select_list(vf, list); break;
+       }
+}
+
 void vf_mark_to_selection(ViewFile *vf, gint mark, MarkToSelectionMode mode)
 {
        switch (vf->type)
@@ -284,20 +318,30 @@ static void vf_dnd_init(ViewFile *vf)
 
 GList *vf_pop_menu_file_list(ViewFile *vf)
 {
+       GList *ret;
+
        switch (vf->type)
        {
-       case FILEVIEW_LIST: return vflist_pop_menu_file_list(vf);
-       case FILEVIEW_ICON: return vficon_pop_menu_file_list(vf);
+       case FILEVIEW_LIST: ret = vflist_pop_menu_file_list(vf); break;
+       case FILEVIEW_ICON: ret = vficon_pop_menu_file_list(vf); break;
+       default: ret = NULL;
        }
+
+       return ret;
 }
 
 GList *vf_selection_get_one(ViewFile *vf, FileData *fd)
 {
+       GList *ret;
+
        switch (vf->type)
        {
-       case FILEVIEW_LIST: return vflist_selection_get_one(vf, fd);
-       case FILEVIEW_ICON: return vficon_selection_get_one(vf, fd);
+       case FILEVIEW_LIST: ret = vflist_selection_get_one(vf, fd); break;
+       case FILEVIEW_ICON: ret = vficon_selection_get_one(vf, fd); break;
+       default: ret = NULL;
        }
+
+       return ret;
 }
 
 static void vf_pop_menu_edit_cb(GtkWidget *widget, gpointer data)
@@ -323,6 +367,36 @@ static void vf_pop_menu_view_cb(GtkWidget *widget, gpointer data)
        }
 }
 
+static void vf_pop_menu_open_archive_cb(GtkWidget *widget, gpointer data)
+{
+       ViewFile *vf = data;
+       LayoutWindow *lw_new;
+       FileData *fd;
+       gchar *dest_dir;
+
+       switch (vf->type)
+       {
+       case FILEVIEW_LIST:
+               fd = (VFLIST(vf)->click_fd);
+               break;
+       case FILEVIEW_ICON:
+               fd = (VFICON(vf)->click_fd);
+               break;
+       }
+
+       dest_dir = open_archive(fd);
+       if (dest_dir)
+               {
+               lw_new = layout_new_from_default();
+               layout_set_path(lw_new, dest_dir);
+               g_free(dest_dir);
+               }
+       else
+               {
+               warning_dialog(_("Cannot open archive file"), _("See the Log Window"), GTK_STOCK_DIALOG_WARNING, NULL);
+               }
+}
+
 static void vf_pop_menu_copy_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
@@ -352,6 +426,15 @@ static void vf_pop_menu_delete_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
+       options->file_ops.safe_delete_enable = FALSE;
+       file_util_delete(NULL, vf_pop_menu_file_list(vf), vf->listview);
+}
+
+static void vf_pop_menu_move_to_trash_cb(GtkWidget *widget, gpointer data)
+{
+       ViewFile *vf = data;
+
+       options->file_ops.safe_delete_enable = TRUE;
        file_util_delete(NULL, vf_pop_menu_file_list(vf), vf->listview);
 }
 
@@ -484,23 +567,6 @@ static void vf_pop_menu_toggle_view_type_cb(GtkWidget *widget, gpointer data)
        layout_views_set(vf->layout, vf->layout->options.dir_view_type, new_type);
 }
 
-static void vf_pop_menu_toggle_star_rating(ViewFile *vf)
-{
-       GtkAllocation allocation;
-
-       options->show_star_rating = !options->show_star_rating;
-
-       gtk_widget_get_allocation(vf->listview, &allocation);
-       vf_star_rating_set(vf, options->show_star_rating);
-}
-
-static void vf_pop_menu_show_star_rating_cb(GtkWidget *widget, gpointer data)
-{
-       ViewFile *vf = data;
-
-       vf_pop_menu_toggle_star_rating(vf);
-}
-
 static void vf_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
@@ -551,20 +617,30 @@ GtkWidget *vf_pop_menu(ViewFile *vf)
        GtkWidget *item;
        GtkWidget *submenu;
        gboolean active = FALSE;
+       gboolean class_archive = FALSE;
+       GtkAccelGroup *accel_group;
 
        switch (vf->type)
        {
        case FILEVIEW_LIST:
                vflist_color_set(vf, VFLIST(vf)->click_fd, TRUE);
                active = (VFLIST(vf)->click_fd != NULL);
+               class_archive = (VFLIST(vf)->click_fd != NULL && VFLIST(vf)->click_fd->format_class == FORMAT_CLASS_ARCHIVE);
                break;
        case FILEVIEW_ICON:
                active = (VFICON(vf)->click_fd != NULL);
+               class_archive = (VFICON(vf)->click_fd != NULL && VFICON(vf)->click_fd->format_class == FORMAT_CLASS_ARCHIVE);
                break;
        }
 
        menu = popup_menu_short_lived();
 
+       accel_group = gtk_accel_group_new();
+       gtk_menu_set_accel_group(GTK_MENU(menu), accel_group);
+
+       g_object_set_data(G_OBJECT(menu), "window_keys", NULL);
+       g_object_set_data(G_OBJECT(menu), "accel_group", accel_group);
+
        g_signal_connect(G_OBJECT(menu), "destroy",
                         G_CALLBACK(vf_popup_destroy_cb), vf);
 
@@ -622,6 +698,8 @@ GtkWidget *vf_pop_menu(ViewFile *vf)
        menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, active,
                                      G_CALLBACK(vf_pop_menu_view_cb), vf);
 
+       menu_item_add_stock_sensitive(menu, _("Open archive"), GTK_STOCK_OPEN, active & class_archive, G_CALLBACK(vf_pop_menu_open_archive_cb), vf);
+
        menu_item_add_divider(menu);
        menu_item_add_stock_sensitive(menu, _("_Copy..."), GTK_STOCK_COPY, active,
                                      G_CALLBACK(vf_pop_menu_copy_cb), vf);
@@ -629,12 +707,19 @@ GtkWidget *vf_pop_menu(ViewFile *vf)
                                G_CALLBACK(vf_pop_menu_move_cb), vf);
        menu_item_add_sensitive(menu, _("_Rename..."), active,
                                G_CALLBACK(vf_pop_menu_rename_cb), vf);
-       menu_item_add_sensitive(menu, _("_Copy path"), active,
+       menu_item_add_sensitive(menu, _("_Copy path to clipboard"), active,
                                G_CALLBACK(vf_pop_menu_copy_path_cb), vf);
-       menu_item_add_sensitive(menu, _("_Copy path unquoted"), active,
+       menu_item_add_sensitive(menu, _("_Copy path unquoted to clipboard"), active,
                                G_CALLBACK(vf_pop_menu_copy_path_unquoted_cb), vf);
-       menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, active,
-                                     G_CALLBACK(vf_pop_menu_delete_cb), vf);
+       menu_item_add_divider(menu);
+       menu_item_add_stock_sensitive(menu,
+                               options->file_ops.confirm_move_to_trash ? _("Move to Trash...") :
+                                       _("Move to Trash"), PIXBUF_INLINE_ICON_TRASH, active,
+                               G_CALLBACK(vf_pop_menu_move_to_trash_cb), vf);
+       menu_item_add_stock_sensitive(menu,
+                               options->file_ops.confirm_delete ? _("_Delete...") :
+                                       _("_Delete"), GTK_STOCK_DELETE, active,
+                               G_CALLBACK(vf_pop_menu_delete_cb), vf);
        menu_item_add_divider(menu);
 
        menu_item_add_sensitive(menu, _("Enable file _grouping"), active,
@@ -661,10 +746,10 @@ GtkWidget *vf_pop_menu(ViewFile *vf)
        item = menu_item_add(menu, _("_Sort"), NULL, NULL);
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
 
-       item = menu_item_add_radio(menu, _("View as _List"), GINT_TO_POINTER(FILEVIEW_LIST), vf->type == FILEVIEW_LIST,
+       item = menu_item_add_radio(menu, _("Images as List"), GINT_TO_POINTER(FILEVIEW_LIST), vf->type == FILEVIEW_LIST,
                                            G_CALLBACK(vf_pop_menu_toggle_view_type_cb), vf);
 
-       item = menu_item_add_radio(menu, _("View as _Icons"), GINT_TO_POINTER(FILEVIEW_ICON), vf->type == FILEVIEW_ICON,
+       item = menu_item_add_radio(menu, _("Images as Icons"), GINT_TO_POINTER(FILEVIEW_ICON), vf->type == FILEVIEW_ICON,
                                            G_CALLBACK(vf_pop_menu_toggle_view_type_cb), vf);
 
        switch (vf->type)
@@ -698,20 +783,30 @@ GtkWidget *vf_pop_menu(ViewFile *vf)
 
 gboolean vf_refresh(ViewFile *vf)
 {
+       gboolean ret;
+
        switch (vf->type)
        {
-       case FILEVIEW_LIST: return vflist_refresh(vf);
-       case FILEVIEW_ICON: return vficon_refresh(vf);
+       case FILEVIEW_LIST: ret = vflist_refresh(vf); break;
+       case FILEVIEW_ICON: ret = vficon_refresh(vf); break;
+       default: ret = FALSE;
        }
+
+       return ret;
 }
 
 gboolean vf_set_fd(ViewFile *vf, FileData *dir_fd)
 {
+       gboolean ret;
+
        switch (vf->type)
        {
-       case FILEVIEW_LIST: return vflist_set_fd(vf, dir_fd);
-       case FILEVIEW_ICON: return vficon_set_fd(vf, dir_fd);
+       case FILEVIEW_LIST: ret = vflist_set_fd(vf, dir_fd); break;
+       case FILEVIEW_ICON: ret = vficon_set_fd(vf, dir_fd); break;
+       default: ret = FALSE;
        }
+
+       return ret;
 }
 
 static void vf_destroy_cb(GtkWidget *widget, gpointer data)
@@ -844,6 +939,81 @@ static gboolean vf_marks_tooltip_cb(GtkWidget *widget,
        return FALSE;
 }
 
+static void vf_file_filter_save_cb(GtkWidget *widget, gpointer data)
+{
+       ViewFile *vf = data;
+       gchar *entry_text;
+       gchar *remove_text = NULL;
+       gchar *index_text = NULL;
+       gboolean text_found = FALSE;
+       gint i;
+
+       entry_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(vf->file_filter.combo)))));
+
+       if (entry_text[0] == '\0' && vf->file_filter.last_selected >= 0)
+               {
+               gtk_combo_box_set_active(GTK_COMBO_BOX(vf->file_filter.combo), vf->file_filter.last_selected);
+               remove_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(vf->file_filter.combo));
+               history_list_item_remove("file_filter", remove_text);
+               gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT(vf->file_filter.combo), vf->file_filter.last_selected);
+               g_free(remove_text);
+
+               gtk_combo_box_set_active(GTK_COMBO_BOX(vf->file_filter.combo), -1);
+               vf->file_filter.last_selected = - 1;
+               gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(vf->file_filter.combo))), "");
+               vf->file_filter.count--;
+               }
+       else
+               {
+               if (entry_text[0] != '\0')
+                       {
+                       for (i = 0; i < vf->file_filter.count; i++)
+                               {
+                               if (index_text)
+                                       {
+                                       g_free(index_text);
+                                       }
+                               gtk_combo_box_set_active(GTK_COMBO_BOX(vf->file_filter.combo), i);
+                               index_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(vf->file_filter.combo));
+
+                               if (g_strcmp0(index_text, entry_text) == 0)
+                                       {
+                                       text_found = TRUE;
+                                       break;
+                                       }
+                               }
+
+                       g_free(index_text);
+                       if (!text_found)
+                               {
+                               history_list_add_to_key("file_filter", entry_text, 10);
+                               gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(vf->file_filter.combo), entry_text);
+                               vf->file_filter.count++;
+                               gtk_combo_box_set_active(GTK_COMBO_BOX(vf->file_filter.combo), vf->file_filter.count - 1);
+                               }
+                       }
+               }
+       vf_refresh(vf);
+
+       g_free(entry_text);
+}
+
+static void vf_file_filter_cb(GtkWidget *widget, gpointer data)
+{
+       ViewFile *vf = data;
+
+       vf_refresh(vf);
+}
+
+static gboolean vf_file_filter_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+{
+       ViewFile *vf = data;
+       vf->file_filter.last_selected = gtk_combo_box_get_active(GTK_COMBO_BOX(vf->file_filter.combo));
+
+       gtk_widget_grab_focus(widget);
+
+       return TRUE;
+}
 
 static GtkWidget *vf_marks_filter_init(ViewFile *vf)
 {
@@ -870,6 +1040,206 @@ static GtkWidget *vf_marks_filter_init(ViewFile *vf)
        return frame;
 }
 
+void vf_file_filter_set(ViewFile *vf, gboolean enable)
+{
+       if (enable)
+               {
+               gtk_widget_show(vf->file_filter.combo);
+               gtk_widget_show(vf->file_filter.frame);
+               }
+       else
+               {
+               gtk_widget_hide(vf->file_filter.combo);
+               gtk_widget_hide(vf->file_filter.frame);
+               }
+
+       vf_refresh(vf);
+}
+
+static gboolean vf_file_filter_class_cb(GtkWidget *widget, gpointer data)
+{
+       ViewFile *vf = data;
+       gint i;
+
+       gboolean state = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
+
+       for (i = 0; i < FILE_FORMAT_CLASSES; i++)
+               {
+               if (g_strcmp0(format_class_list[i], gtk_menu_item_get_label(GTK_MENU_ITEM(widget))) == 0)
+                       {
+                       options->class_filter[i] = state;
+                       }
+               }
+       vf_refresh(vf);
+
+       return TRUE;
+}
+
+static gboolean vf_file_filter_class_set_all_cb(GtkWidget *widget, gpointer data)
+{
+       ViewFile *vf = data;
+       GtkWidget *parent;
+       GList *children;
+       GtkWidget *child;
+       gint i;
+       gboolean state;
+
+       if (g_strcmp0(_("Select all"), gtk_menu_item_get_label(GTK_MENU_ITEM(widget))) == 0)
+               {
+               state = TRUE;
+               }
+       else
+               {
+               state = FALSE;
+               }
+
+       for (i = 0; i < FILE_FORMAT_CLASSES; i++)
+               {
+               options->class_filter[i] = state;
+               }
+
+       i = 0;
+       parent = gtk_widget_get_parent(widget);
+       children = gtk_container_get_children(GTK_CONTAINER(parent));
+       while (children)
+               {
+               child = children->data;
+               if (i < FILE_FORMAT_CLASSES)
+                       {
+                       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(child), state);
+                       }
+               i++;
+               children = children->next;
+               }
+       g_list_free(children);
+       vf_refresh(vf);
+
+       return TRUE;
+}
+
+static GtkWidget *class_filter_menu (ViewFile *vf)
+{
+       GtkWidget *menu;
+       GtkWidget *menu_item;
+       int i;
+
+       menu = gtk_menu_new();
+
+       for (i = 0; i < FILE_FORMAT_CLASSES; i++)
+           {
+               menu_item = gtk_check_menu_item_new_with_label(format_class_list[i]);
+               gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_item), options->class_filter[i]);
+               g_signal_connect(G_OBJECT(menu_item), "toggled", G_CALLBACK(vf_file_filter_class_cb), vf);
+               gtk_menu_shell_append(GTK_MENU_SHELL (menu), menu_item);
+               gtk_widget_show(menu_item);
+               }
+
+       menu_item = gtk_menu_item_new_with_label(_("Select all"));
+       gtk_menu_shell_append(GTK_MENU_SHELL (menu), menu_item);
+       gtk_widget_show(menu_item);
+       g_signal_connect(G_OBJECT(menu_item), "activate", G_CALLBACK(vf_file_filter_class_set_all_cb), vf);
+
+       menu_item = gtk_menu_item_new_with_label(_("Select none"));
+       gtk_menu_shell_append(GTK_MENU_SHELL (menu), menu_item);
+       gtk_widget_show(menu_item);
+       g_signal_connect(G_OBJECT(menu_item), "activate", G_CALLBACK(vf_file_filter_class_set_all_cb), vf);
+
+       return menu;
+}
+
+static void case_sensitive_cb(GtkWidget *widget, gpointer data)
+{
+       ViewFile *vf = data;
+
+       vf->file_filter.case_sensitive = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+       vf_refresh(vf);
+}
+
+static void file_filter_clear_cb(GtkEntry *entry, GtkEntryIconPosition pos, GdkEvent *event, gpointer userdata)
+{
+       if (pos == GTK_ENTRY_ICON_SECONDARY)
+               {
+               gtk_entry_set_text(GTK_ENTRY(userdata), "");
+               gtk_widget_grab_focus(GTK_WIDGET(userdata));
+               }
+}
+
+static GtkWidget *vf_file_filter_init(ViewFile *vf)
+{
+       GtkWidget *frame = gtk_frame_new(NULL);
+       GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
+       GList *work;
+       gint n = 0;
+       GtkWidget *combo_entry;
+       GtkWidget *menubar;
+       GtkWidget *menuitem;
+       GtkWidget *case_sensitive;
+       GtkWidget *box;
+       GtkWidget *icon;
+       GtkWidget *label;
+
+       vf->file_filter.combo = gtk_combo_box_text_new_with_entry();
+       combo_entry = gtk_bin_get_child(GTK_BIN(vf->file_filter.combo));
+       gtk_widget_show(gtk_bin_get_child(GTK_BIN(vf->file_filter.combo)));
+       gtk_widget_show((GTK_WIDGET(vf->file_filter.combo)));
+       gtk_widget_set_tooltip_text(GTK_WIDGET(vf->file_filter.combo), _("Use regular expressions"));
+
+       gtk_entry_set_icon_from_stock(GTK_ENTRY(combo_entry), GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+       gtk_entry_set_icon_tooltip_text (GTK_ENTRY(combo_entry), GTK_ENTRY_ICON_SECONDARY, _("Clear"));
+       g_signal_connect(GTK_ENTRY(combo_entry), "icon-press", G_CALLBACK(file_filter_clear_cb), combo_entry);
+
+       work = history_list_get_by_key("file_filter");
+       while (work)
+               {
+               gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(vf->file_filter.combo), (gchar *)work->data);
+               work = work->next;
+               n++;
+               vf->file_filter.count = n;
+               }
+       gtk_combo_box_set_active(GTK_COMBO_BOX(vf->file_filter.combo), 0);
+
+       g_signal_connect(G_OBJECT(combo_entry), "activate",
+               G_CALLBACK(vf_file_filter_save_cb), vf);
+               
+       g_signal_connect(G_OBJECT(vf->file_filter.combo), "changed",
+               G_CALLBACK(vf_file_filter_cb), vf);
+
+       g_signal_connect(G_OBJECT(combo_entry), "button_press_event",
+                        G_CALLBACK(vf_file_filter_press_cb), vf);
+
+       gtk_box_pack_start(GTK_BOX(hbox), vf->file_filter.combo, FALSE, FALSE, 0);
+       gtk_widget_show(vf->file_filter.combo);
+       gtk_container_add(GTK_CONTAINER(frame), hbox);
+       gtk_widget_show(hbox);
+
+       case_sensitive = gtk_check_button_new_with_label(_("Case"));
+       gtk_box_pack_start(GTK_BOX(hbox), case_sensitive, FALSE, FALSE, 0);
+       gtk_widget_set_tooltip_text(GTK_WIDGET(case_sensitive), _("Case sensitive"));
+       g_signal_connect(G_OBJECT(case_sensitive), "clicked", G_CALLBACK(case_sensitive_cb), vf);
+       gtk_widget_show(case_sensitive);
+
+       menubar = gtk_menu_bar_new();
+       gtk_box_pack_start(GTK_BOX(hbox), menubar, FALSE, TRUE, 0);
+       gtk_widget_show(menubar);
+
+       box = gtk_hbox_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
+       icon = gtk_image_new_from_icon_name("pan-down", GTK_ICON_SIZE_MENU);
+       label = gtk_label_new(_("Class"));
+
+       gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 0);
+       gtk_box_pack_end(GTK_BOX(box), icon, FALSE, FALSE, 0);
+
+       menuitem = gtk_menu_item_new();
+
+       gtk_widget_set_tooltip_text(GTK_WIDGET(menuitem), _("Select Class filter"));
+       gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), class_filter_menu(vf));
+       gtk_menu_shell_append(GTK_MENU_SHELL(menubar), menuitem);
+       gtk_container_add(GTK_CONTAINER(menuitem), box);
+       gtk_widget_show_all(menuitem);
+
+       return frame;
+}
+
 void vf_mark_filter_toggle(ViewFile *vf, gint mark)
 {
        gint n = mark - 1;
@@ -894,9 +1264,11 @@ ViewFile *vf_new(FileViewType type, FileData *dir_fd)
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
        vf->filter = vf_marks_filter_init(vf);
+       vf->file_filter.frame = vf_file_filter_init(vf);
 
        vf->widget = gtk_vbox_new(FALSE, 0);
        gtk_box_pack_start(GTK_BOX(vf->widget), vf->filter, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(vf->widget), vf->file_filter.frame, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(vf->widget), vf->scrolled, TRUE, TRUE, 0);
        gtk_widget_show(vf->scrolled);
 
@@ -1122,6 +1494,97 @@ void vf_thumb_update(ViewFile *vf)
        while (vf_thumb_next(vf));
 }
 
+void vf_star_cleanup(ViewFile *vf)
+{
+       if (vf->stars_id != 0)
+               {
+               g_source_remove(vf->stars_id);
+               }
+
+       vf->stars_id = 0;
+       vf->stars_filedata = NULL;
+}
+
+void vf_star_stop(ViewFile *vf)
+{
+        vf_star_cleanup(vf);
+}
+
+static void vf_set_star_fd(ViewFile *vf, FileData *fd)
+{
+       switch (vf->type)
+               {
+               case FILEVIEW_LIST: vflist_set_star_fd(vf, fd); break;
+               case FILEVIEW_ICON: vficon_set_star_fd(vf, fd); break;
+               default: break;
+               }
+}
+
+static void vf_star_do(ViewFile *vf, FileData *fd)
+{
+       if (!fd) return;
+
+       vf_set_star_fd(vf, fd);
+}
+
+static gboolean vf_star_next(ViewFile *vf)
+{
+       FileData *fd = NULL;
+
+       switch (vf->type)
+               {
+               case FILEVIEW_LIST: fd = vflist_star_next_fd(vf); break;
+               case FILEVIEW_ICON: fd = vficon_star_next_fd(vf); break;
+               default: break;
+               }
+
+       if (!fd)
+               {
+               /* done */
+               vf_star_cleanup(vf);
+               return FALSE;
+               }
+
+       return TRUE;
+}
+
+gboolean vf_stars_cb(gpointer data)
+{
+       ViewFile *vf = data;
+       FileData *fd = vf->stars_filedata;
+
+       if (fd)
+               {
+               read_rating_data(fd);
+
+               vf_star_do(vf, fd);
+
+               if (vf_star_next(vf))
+                       {
+                       return TRUE;
+                       }
+               else
+                       {
+                       vf->stars_filedata = NULL;
+                       vf->stars_id = 0;
+                       return FALSE;
+                       }
+               }
+
+       return FALSE;
+}
+
+void vf_star_update(ViewFile *vf)
+{
+       vf_star_stop(vf);
+
+       if (!options->show_star_rating)
+               {
+               return;
+               }
+
+       vf_star_next(vf);
+}
 
 void vf_marks_set(ViewFile *vf, gboolean enable)
 {
@@ -1171,6 +1634,60 @@ guint vf_marks_get_filter(ViewFile *vf)
        return ret;
 }
 
+GRegex *vf_file_filter_get_filter(ViewFile *vf)
+{
+       GRegex *ret = NULL;
+       GError *error = NULL;
+       gchar *file_filter_text = NULL;
+
+       if (!gtk_widget_get_visible(vf->file_filter.combo))
+               {
+               return g_regex_new("", 0, 0, NULL);
+               }
+
+       file_filter_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(vf->file_filter.combo));
+
+       if (file_filter_text[0] != '\0')
+               {
+               ret = g_regex_new(file_filter_text, vf->file_filter.case_sensitive ? 0 : G_REGEX_CASELESS, 0, &error);
+               if (error)
+                       {
+                       log_printf("Error: could not compile regular expression %s\n%s\n", file_filter_text, error->message);
+                       g_error_free(error);
+                       error = NULL;
+                       ret = g_regex_new("", 0, 0, NULL);
+                       }
+               g_free(file_filter_text);
+               }
+       else
+               {
+               ret = g_regex_new("", 0, 0, NULL);
+               }
+
+       return ret;
+}
+
+guint vf_class_get_filter(ViewFile *vf)
+{
+       guint ret = 0;
+       gint i;
+
+       if (!gtk_widget_get_visible(vf->file_filter.combo))
+               {
+               return G_MAXUINT;
+               }
+
+       for ( i = 0; i < FILE_FORMAT_CLASSES; i++)
+               {
+               if (options->class_filter[i])
+                       {
+                       ret |= 1 << i;
+                       }
+               }
+
+       return ret;
+}
+
 void vf_set_layout(ViewFile *vf, LayoutWindow *layout)
 {
        vf->layout = layout;
@@ -1226,7 +1743,7 @@ void vf_notify_cb(FileData *fd, NotifyType type, gpointer data)
 
        NotifyType interested = NOTIFY_CHANGE | NOTIFY_REREAD | NOTIFY_GROUPING;
        if (vf->marks_enabled) interested |= NOTIFY_MARKS | NOTIFY_METADATA;
-       /* FIXME: NOTIFY_METADATA should be checked by the keyword-to-mark functions and converted to NOTIFY_MARKS only if there was a change */
+       /** @FIXME NOTIFY_METADATA should be checked by the keyword-to-mark functions and converted to NOTIFY_MARKS only if there was a change */
 
        if (!(type & interested) || vf->refresh_idle_id || !vf->dir_fd) return;
 
@@ -1267,7 +1784,6 @@ static gboolean vf_read_metadata_in_idle_cb(gpointer data)
 {
        FileData *fd;
        ViewFile *vf = data;
-       GList *list_entry;
        GList *work;
 
        vf_thumb_status(vf, vf_read_metadata_in_idle_progress(vf), _("Loading meta..."));
@@ -1314,9 +1830,6 @@ static void vf_read_metadata_in_idle_finished_cb(gpointer data)
 
 void vf_read_metadata_in_idle(ViewFile *vf)
 {
-       GList *work;
-       FileData *fd;
-
        if (!vf) return;
 
        if (vf->read_metadata_in_idle_id)