Trim trailing white spaces.
[geeqie.git] / src / view_file.c
index 7baffc1..ebbdba1 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Geeqie
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: Laurent Monin
  *
@@ -13,9 +13,9 @@
 #include "view_file.h"
 
 #include "editors.h"
-#include "info.h"
 #include "layout.h"
 #include "menu.h"
+#include "thumb.h"
 #include "ui_menu.h"
 #include "ui_fileops.h"
 #include "utilops.h"
@@ -39,9 +39,9 @@ void vf_send_update(ViewFile *vf)
  *-----------------------------------------------------------------------------
  */
 
-void vf_sort_set(ViewFile *vf, SortType type, gint ascend)
+void vf_sort_set(ViewFile *vf, SortType type, gboolean ascend)
 {
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: vflist_sort_set(vf, type, ascend); break;
        case FILEVIEW_ICON: vficon_sort_set(vf, type, ascend); break;
@@ -58,7 +58,7 @@ FileData *vf_index_get_data(ViewFile *vf, gint row)
 {
        FileData *fd = NULL;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: fd = vflist_index_get_data(vf, row); break;
        case FILEVIEW_ICON: fd = vficon_index_get_data(vf, row); break;
@@ -67,14 +67,14 @@ FileData *vf_index_get_data(ViewFile *vf, gint row)
        return fd;
 }
 
-gint vf_index_by_path(ViewFile *vf, const gchar *path)
+gint vf_index_by_fd(ViewFile *vf, FileData *fd)
 {
        gint index = -1;
 
-       switch(vf->type)
+       switch (vf->type)
        {
-       case FILEVIEW_LIST: index = vflist_index_by_path(vf, path); break;
-       case FILEVIEW_ICON: index = vficon_index_by_path(vf, path); break;
+       case FILEVIEW_LIST: index = vflist_index_by_fd(vf, fd); break;
+       case FILEVIEW_ICON: index = vficon_index_by_fd(vf, fd); break;
        }
 
        return index;
@@ -84,7 +84,7 @@ guint vf_count(ViewFile *vf, gint64 *bytes)
 {
        guint count = 0;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: count = vflist_count(vf, bytes); break;
        case FILEVIEW_ICON: count = vficon_count(vf, bytes); break;
@@ -97,7 +97,7 @@ GList *vf_get_list(ViewFile *vf)
 {
        GList *list = NULL;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: list = vflist_get_list(vf); break;
        case FILEVIEW_ICON: list = vficon_get_list(vf); break;
@@ -113,12 +113,12 @@ GList *vf_get_list(ViewFile *vf)
  *-------------------------------------------------------------------
  */
 
-static gint vf_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean vf_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
        ViewFile *vf = data;
-       gint ret = FALSE;
+       gboolean ret = FALSE;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: ret = vflist_press_key_cb(widget, event, data); break;
        case FILEVIEW_ICON: ret = vficon_press_key_cb(widget, event, data); break;
@@ -133,12 +133,12 @@ static gint vf_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data
  *-------------------------------------------------------------------
  */
 
-static gint vf_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean vf_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 {
        ViewFile *vf = data;
-       gint ret = FALSE;
+       gboolean ret = FALSE;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: ret = vflist_press_cb(widget, bevent, data); break;
        case FILEVIEW_ICON: ret = vficon_press_cb(widget, bevent, data); break;
@@ -147,12 +147,12 @@ static gint vf_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data
        return ret;
 }
 
-static gint vf_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean vf_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 {
        ViewFile *vf = data;
-       gint ret = FALSE;
+       gboolean ret = FALSE;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: ret = vflist_release_cb(widget, bevent, data); break;
        case FILEVIEW_ICON: ret = vficon_release_cb(widget, bevent, data); break;
@@ -168,11 +168,25 @@ static gint vf_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer da
  *-----------------------------------------------------------------------------
  */
 
+gboolean vf_index_is_selected(ViewFile *vf, gint row)
+{
+       gboolean ret = FALSE;
+
+       switch (vf->type)
+       {
+       case FILEVIEW_LIST: ret = vflist_index_is_selected(vf, row); break;
+       case FILEVIEW_ICON: ret = vficon_index_is_selected(vf, row); break;
+       }
+
+       return ret;
+}
+
+
 guint vf_selection_count(ViewFile *vf, gint64 *bytes)
 {
        guint count = 0;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: count = vflist_selection_count(vf, bytes); break;
        case FILEVIEW_ICON: count = vficon_selection_count(vf, bytes); break;
@@ -185,7 +199,7 @@ GList *vf_selection_get_list(ViewFile *vf)
 {
        GList *list = NULL;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: list = vflist_selection_get_list(vf); break;
        case FILEVIEW_ICON: list = vficon_selection_get_list(vf); break;
@@ -198,7 +212,7 @@ GList *vf_selection_get_list_by_index(ViewFile *vf)
 {
        GList *list = NULL;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: list = vflist_selection_get_list_by_index(vf); break;
        case FILEVIEW_ICON: list = vficon_selection_get_list_by_index(vf); break;
@@ -209,7 +223,7 @@ GList *vf_selection_get_list_by_index(ViewFile *vf)
 
 void vf_select_all(ViewFile *vf)
 {
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: vflist_select_all(vf); break;
        case FILEVIEW_ICON: vficon_select_all(vf); break;
@@ -218,7 +232,7 @@ void vf_select_all(ViewFile *vf)
 
 void vf_select_none(ViewFile *vf)
 {
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: vflist_select_none(vf); break;
        case FILEVIEW_ICON: vficon_select_none(vf); break;
@@ -227,7 +241,7 @@ void vf_select_none(ViewFile *vf)
 
 void vf_select_invert(ViewFile *vf)
 {
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: vflist_select_invert(vf); break;
        case FILEVIEW_ICON: vficon_select_invert(vf); break;
@@ -236,7 +250,7 @@ void vf_select_invert(ViewFile *vf)
 
 void vf_select_by_fd(ViewFile *vf, FileData *fd)
 {
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: vflist_select_by_fd(vf, fd); break;
        case FILEVIEW_ICON: vficon_select_by_fd(vf, fd); break;
@@ -245,7 +259,7 @@ void vf_select_by_fd(ViewFile *vf, FileData *fd)
 
 void vf_mark_to_selection(ViewFile *vf, gint mark, MarkToSelectionMode mode)
 {
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: vflist_mark_to_selection(vf, mark, mode); break;
        case FILEVIEW_ICON: vficon_mark_to_selection(vf, mark, mode); break;
@@ -254,7 +268,7 @@ void vf_mark_to_selection(ViewFile *vf, gint mark, MarkToSelectionMode mode)
 
 void vf_selection_to_mark(ViewFile *vf, gint mark, SelectionToMarkMode mode)
 {
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: vflist_selection_to_mark(vf, mark, mode); break;
        case FILEVIEW_ICON: vficon_selection_to_mark(vf, mark, mode); break;
@@ -270,7 +284,7 @@ void vf_selection_to_mark(ViewFile *vf, gint mark, SelectionToMarkMode mode)
 
 static void vf_dnd_init(ViewFile *vf)
 {
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: vflist_dnd_init(vf); break;
        case FILEVIEW_ICON: vficon_dnd_init(vf); break;
@@ -287,7 +301,7 @@ GList *vf_pop_menu_file_list(ViewFile *vf)
 {
        GList *ret = NULL;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: ret = vflist_pop_menu_file_list(vf); break;
        case FILEVIEW_ICON: ret = vficon_pop_menu_file_list(vf); break;
@@ -296,34 +310,36 @@ GList *vf_pop_menu_file_list(ViewFile *vf)
        return ret;
 }
 
+GList *vf_selection_get_one(ViewFile *vf, FileData *fd)
+{
+       GList *ret = NULL;
+
+       switch (vf->type)
+       {
+       case FILEVIEW_LIST: ret = vflist_selection_get_one(vf, fd); break;
+       case FILEVIEW_ICON: ret = vficon_selection_get_one(vf, fd); break;
+       }
+
+       return ret;
+}
+
 static void vf_pop_menu_edit_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf;
-       gint n;
-       GList *list;
+       const gchar *key = data;
 
        vf = submenu_item_get_data(widget);
-       n = GPOINTER_TO_INT(data);
 
        if (!vf) return;
 
-       list = vf_pop_menu_file_list(vf);
-       file_util_start_editor_from_filelist(n, list, vf->listview);
-       filelist_free(list);
-}
-
-static void vf_pop_menu_info_cb(GtkWidget *widget, gpointer data)
-{
-       ViewFile *vf = data;
-
-       info_window_new(NULL, vf_pop_menu_file_list(vf), NULL);
+       file_util_start_editor_from_filelist(key, vf_pop_menu_file_list(vf), vf->dir_fd->path, vf->listview);
 }
 
 static void vf_pop_menu_view_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: vflist_pop_menu_view_cb(widget, data); break;
        case FILEVIEW_ICON: vficon_pop_menu_view_cb(widget, data); break;
@@ -348,7 +364,7 @@ static void vf_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: vflist_pop_menu_rename_cb(widget, data); break;
        case FILEVIEW_ICON: vficon_pop_menu_rename_cb(widget, data); break;
@@ -369,6 +385,20 @@ static void vf_pop_menu_copy_path_cb(GtkWidget *widget, gpointer data)
        file_util_copy_path_list_to_clipboard(vf_pop_menu_file_list(vf));
 }
 
+static void vf_pop_menu_enable_grouping_cb(GtkWidget *widget, gpointer data)
+{
+       ViewFile *vf = data;
+
+       file_data_disable_grouping_list(vf_pop_menu_file_list(vf), FALSE);
+}
+
+static void vf_pop_menu_disable_grouping_cb(GtkWidget *widget, gpointer data)
+{
+       ViewFile *vf = data;
+
+       file_data_disable_grouping_list(vf_pop_menu_file_list(vf), TRUE);
+}
+
 static void vf_pop_menu_sort_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf;
@@ -450,25 +480,17 @@ static void vf_pop_menu_toggle_mark_sel_cb(GtkWidget *widget, gpointer data)
 static void vf_pop_menu_toggle_view_type_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
-       
+       FileViewType new_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "menu_item_radio_data"));
        if (!vf->layout) return;
 
-       switch(vf->layout->file_view_type)
-       {
-       case FILEVIEW_LIST:
-               layout_views_set(vf->layout, vf->layout->dir_view_type, FILEVIEW_ICON);
-               break;
-       case FILEVIEW_ICON:
-               layout_views_set(vf->layout, vf->layout->dir_view_type, FILEVIEW_LIST);
-               break;
-       }
+       layout_views_set(vf->layout, vf->layout->options.dir_view_type, new_type);
 }
 
 static void vf_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: vflist_pop_menu_refresh_cb(widget, data); break;
        case FILEVIEW_ICON: vficon_pop_menu_refresh_cb(widget, data); break;
@@ -479,11 +501,14 @@ static void vf_popup_destroy_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: vflist_popup_destroy_cb(widget, data); break;
        case FILEVIEW_ICON: vficon_popup_destroy_cb(widget, data); break;
        }
+
+       filelist_free(vf->editmenu_fd_list);
+       vf->editmenu_fd_list = NULL;
 }
 
 GtkWidget *vf_pop_menu(ViewFile *vf)
@@ -491,9 +516,9 @@ GtkWidget *vf_pop_menu(ViewFile *vf)
        GtkWidget *menu;
        GtkWidget *item;
        GtkWidget *submenu;
-       gint active = 0;
+       gboolean active = FALSE;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST:
                vflist_color_set(vf, VFLIST(vf)->click_fd, TRUE);
@@ -556,11 +581,10 @@ GtkWidget *vf_pop_menu(ViewFile *vf)
                g_free(str_sel_mark_minus);
                }
 
-       submenu_add_edit(menu, &item, G_CALLBACK(vf_pop_menu_edit_cb), vf);
+       vf->editmenu_fd_list = vf_pop_menu_file_list(vf);
+       submenu_add_edit(menu, &item, G_CALLBACK(vf_pop_menu_edit_cb), vf, vf->editmenu_fd_list);
        gtk_widget_set_sensitive(item, active);
 
-       menu_item_add_stock_sensitive(menu, _("_Properties"), GTK_STOCK_PROPERTIES, active,
-                                     G_CALLBACK(vf_pop_menu_info_cb), vf);
        menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, active,
                                      G_CALLBACK(vf_pop_menu_view_cb), vf);
 
@@ -573,9 +597,13 @@ GtkWidget *vf_pop_menu(ViewFile *vf)
                                G_CALLBACK(vf_pop_menu_rename_cb), vf);
        menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, active,
                                      G_CALLBACK(vf_pop_menu_delete_cb), vf);
-       if (options->show_copy_path)
-               menu_item_add_sensitive(menu, _("_Copy path"), active,
-                                       G_CALLBACK(vf_pop_menu_copy_path_cb), vf);
+       menu_item_add_sensitive(menu, _("_Copy path"), active,
+                               G_CALLBACK(vf_pop_menu_copy_path_cb), vf);
+
+       menu_item_add_sensitive(menu, _("Enable file _grouping"), active,
+                               G_CALLBACK(vf_pop_menu_enable_grouping_cb), vf);
+       menu_item_add_sensitive(menu, _("Disable file groupi_ng"), active,
+                               G_CALLBACK(vf_pop_menu_disable_grouping_cb), vf);
 
        menu_item_add_divider(menu);
 
@@ -588,10 +616,13 @@ GtkWidget *vf_pop_menu(ViewFile *vf)
        item = menu_item_add(menu, _("_Sort"), NULL, NULL);
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
 
-       menu_item_add_check(menu, _("View as _icons"), (vf->type == FILEVIEW_ICON),
-                           G_CALLBACK(vf_pop_menu_toggle_view_type_cb), vf);
+       item = menu_item_add_radio(menu, _("View as _List"), GINT_TO_POINTER(FILEVIEW_LIST), vf->type == FILEVIEW_LIST,
+                                           G_CALLBACK(vf_pop_menu_toggle_view_type_cb), vf);
 
-       switch(vf->type)
+       item = menu_item_add_radio(menu, _("View as _Icons"), GINT_TO_POINTER(FILEVIEW_ICON), vf->type == FILEVIEW_ICON,
+                                           G_CALLBACK(vf_pop_menu_toggle_view_type_cb), vf);
+
+       switch (vf->type)
        {
        case FILEVIEW_LIST:
                menu_item_add_check(menu, _("Show _thumbnails"), VFLIST(vf)->thumbs_enabled,
@@ -608,11 +639,11 @@ GtkWidget *vf_pop_menu(ViewFile *vf)
        return menu;
 }
 
-gint vf_refresh(ViewFile *vf)
+gboolean vf_refresh(ViewFile *vf)
 {
-       gint ret = FALSE;
+       gboolean ret = FALSE;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: ret = vflist_refresh(vf); break;
        case FILEVIEW_ICON: ret = vficon_refresh(vf); break;
@@ -621,11 +652,11 @@ gint vf_refresh(ViewFile *vf)
        return ret;
 }
 
-gint vf_set_fd(ViewFile *vf, FileData *dir_fd)
+gboolean vf_set_fd(ViewFile *vf, FileData *dir_fd)
 {
-       gint ret = FALSE;
+       gboolean ret = FALSE;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: ret = vflist_set_fd(vf, dir_fd); break;
        case FILEVIEW_ICON: ret = vficon_set_fd(vf, dir_fd); break;
@@ -638,7 +669,7 @@ static void vf_destroy_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: vflist_destroy_cb(widget, data); break;
        case FILEVIEW_ICON: vficon_destroy_cb(widget, data); break;
@@ -685,27 +716,22 @@ static GtkWidget *vf_marks_filter_init(ViewFile *vf)
        return frame;
 }
 
+void vf_mark_filter_toggle(ViewFile *vf, gint mark)
+{
+       gint n = mark - 1;
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(vf->filter_check[n]),
+                                    !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(vf->filter_check[n])));
+}
+
 ViewFile *vf_new(FileViewType type, FileData *dir_fd)
 {
        ViewFile *vf;
 
        vf = g_new0(ViewFile, 1);
+       
        vf->type = type;
-
-       vf->info = NULL;
-       vf->dir_fd = NULL;
-       vf->list = NULL;
-
        vf->sort_method = SORT_NAME;
        vf->sort_ascend = TRUE;
-       
-       vf->thumbs_running = FALSE;
-       vf->thumbs_loader = NULL;
-       vf->thumbs_filedata = NULL;
-
-       vf->popup = NULL;
-
-       vf->refresh_idle_id = -1;
 
        vf->scrolled = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(vf->scrolled), GTK_SHADOW_IN);
@@ -722,7 +748,7 @@ ViewFile *vf_new(FileViewType type, FileData *dir_fd)
        g_signal_connect(G_OBJECT(vf->widget), "destroy",
                         G_CALLBACK(vf_destroy_cb), vf);
 
-       switch(type)
+       switch (type)
        {
        case FILEVIEW_LIST: vf = vflist_new(vf, dir_fd); break;
        case FILEVIEW_ICON: vf = vficon_new(vf, dir_fd); break;
@@ -757,22 +783,178 @@ void vf_set_thumb_status_func(ViewFile *vf, void (*func)(ViewFile *vf, gdouble v
        vf->data_thumb_status = data;
 }
 
-void vf_thumb_set(ViewFile *vf, gint enable)
+void vf_thumb_set(ViewFile *vf, gboolean enable)
 {
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: vflist_thumb_set(vf, enable); break;
        case FILEVIEW_ICON: /*vficon_thumb_set(vf, enable);*/ break;
        }
 }
 
-void vf_marks_set(ViewFile *vf, gint enable)
+
+static gboolean vf_thumb_next(ViewFile *vf);
+
+static gdouble vf_thumb_progress(ViewFile *vf)
+{
+       gint count = 0;
+       gint done = 0;
+       
+       switch (vf->type)
+       {
+       case FILEVIEW_LIST: vflist_thumb_progress_count(vf->list, &count, &done); break;
+       case FILEVIEW_ICON: vficon_thumb_progress_count(vf->list, &count, &done); break;
+       }
+       
+       DEBUG_1("thumb progress: %d of %d", done, count);
+       return (gdouble)done / count;
+}
+
+static void vf_set_thumb_fd(ViewFile *vf, FileData *fd)
+{
+       switch (vf->type)
+       {
+       case FILEVIEW_LIST: vflist_set_thumb_fd(vf, fd); break;
+       case FILEVIEW_ICON: vficon_set_thumb_fd(vf, fd); break;
+       }
+}
+
+static void vf_thumb_status(ViewFile *vf, gdouble val, const gchar *text)
+{
+       if (vf->func_thumb_status)
+               {
+               vf->func_thumb_status(vf, val, text, vf->data_thumb_status);
+               }
+}
+
+static void vf_thumb_do(ViewFile *vf, FileData *fd)
+{
+       if (!fd) return;
+
+       vf_set_thumb_fd(vf, fd);
+       vf_thumb_status(vf, vf_thumb_progress(vf), _("Loading thumbs..."));
+}
+
+void vf_thumb_cleanup(ViewFile *vf)
+{
+       vf_thumb_status(vf, 0.0, NULL);
+
+       vf->thumbs_running = FALSE;
+
+       thumb_loader_free(vf->thumbs_loader);
+       vf->thumbs_loader = NULL;
+
+       vf->thumbs_filedata = NULL;
+}
+
+void vf_thumb_stop(ViewFile *vf)
+{
+       if (vf->thumbs_running) vf_thumb_cleanup(vf);
+}
+
+static void vf_thumb_common_cb(ThumbLoader *tl, gpointer data)
+{
+       ViewFile *vf = data;
+
+       if (vf->thumbs_filedata && vf->thumbs_loader == tl)
+               {
+               vf_thumb_do(vf, vf->thumbs_filedata);
+               }
+
+       while (vf_thumb_next(vf));
+}
+
+static void vf_thumb_error_cb(ThumbLoader *tl, gpointer data)
+{
+       vf_thumb_common_cb(tl, data);
+}
+
+static void vf_thumb_done_cb(ThumbLoader *tl, gpointer data)
+{
+       vf_thumb_common_cb(tl, data);
+}
+
+static gboolean vf_thumb_next(ViewFile *vf)
+{
+       FileData *fd = NULL;
+
+       if (!gtk_widget_get_realized(vf->listview))
+               {
+               vf_thumb_status(vf, 0.0, NULL);
+               return FALSE;
+               }
+
+       switch (vf->type)
+       {
+       case FILEVIEW_LIST: fd = vflist_thumb_next_fd(vf); break;
+       case FILEVIEW_ICON: fd = vficon_thumb_next_fd(vf); break;
+       }
+
+       if (!fd)
+               {
+               /* done */
+               vf_thumb_cleanup(vf);
+               return FALSE;
+               }
+
+       vf->thumbs_filedata = fd;
+
+       thumb_loader_free(vf->thumbs_loader);
+
+       vf->thumbs_loader = thumb_loader_new(options->thumbnails.max_width, options->thumbnails.max_height);
+       thumb_loader_set_callbacks(vf->thumbs_loader,
+                                  vf_thumb_done_cb,
+                                  vf_thumb_error_cb,
+                                  NULL,
+                                  vf);
+
+       if (!thumb_loader_start(vf->thumbs_loader, fd))
+               {
+               /* set icon to unknown, continue */
+               DEBUG_1("thumb loader start failed %s", fd->path);
+               vf_thumb_do(vf, fd);
+
+               return TRUE;
+               }
+
+       return FALSE;
+}
+
+static void vf_thumb_reset_all(ViewFile *vf)
+{
+       switch (vf->type)
+       {
+       case FILEVIEW_LIST: vflist_thumb_reset_all(vf); break;
+       case FILEVIEW_ICON: vficon_thumb_reset_all(vf); break;
+       }
+}
+
+void vf_thumb_update(ViewFile *vf)
+{
+       vf_thumb_stop(vf);
+       
+       if (vf->type == FILEVIEW_LIST && !VFLIST(vf)->thumbs_enabled) return;
+
+       vf_thumb_status(vf, 0.0, _("Loading thumbs..."));
+       vf->thumbs_running = TRUE;
+
+       if (thumb_format_changed)
+               {
+               vf_thumb_reset_all(vf);
+               thumb_format_changed = FALSE;
+               }
+
+       while (vf_thumb_next(vf));
+}
+
+
+void vf_marks_set(ViewFile *vf, gboolean enable)
 {
        if (vf->marks_enabled == enable) return;
 
        vf->marks_enabled = enable;
 
-       switch(vf->type)
+       switch (vf->type)
        {
        case FILEVIEW_LIST: vflist_marks_set(vf, enable); break;
        case FILEVIEW_ICON: vficon_marks_set(vf, enable); break;
@@ -813,27 +995,39 @@ void vf_set_layout(ViewFile *vf, LayoutWindow *layout)
  *-----------------------------------------------------------------------------
  */
 
-static gint vf_refresh_idle_cb(gpointer data)
+static gboolean vf_refresh_idle_cb(gpointer data)
 {
        ViewFile *vf = data;
 
        vf_refresh(vf);
-       vf->refresh_idle_id = -1;
+       vf->refresh_idle_id = 0;
        return FALSE;
 }
 
 void vf_refresh_idle_cancel(ViewFile *vf)
 {
-       if (vf->refresh_idle_id != -1) g_source_remove(vf->refresh_idle_id);
-       vf->refresh_idle_id = -1;
+       if (vf->refresh_idle_id)
+               {
+               g_source_remove(vf->refresh_idle_id);
+               vf->refresh_idle_id = 0;
+               }
 }
 
 
 void vf_refresh_idle(ViewFile *vf)
 {
-       if (vf->refresh_idle_id == -1)
+       if (!vf->refresh_idle_id)
                {
-               vf->refresh_idle_id = g_idle_add(vf_refresh_idle_cb, vf);
+               vf->time_refresh_set = time(NULL);
+               /* file operations run with G_PRIORITY_DEFAULT_IDLE */
+               vf->refresh_idle_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE + 50, vf_refresh_idle_cb, vf, NULL);
+               }
+       else if (time(NULL) - vf->time_refresh_set > 1)
+               {
+               /* more than 1 sec since last update - increase priority */
+               vf_refresh_idle_cancel(vf);
+               vf->time_refresh_set = time(NULL);
+               vf->refresh_idle_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE - 50, vf_refresh_idle_cb, vf, NULL);
                }
 }
 
@@ -842,10 +1036,12 @@ void vf_notify_cb(FileData *fd, NotifyType type, gpointer data)
        ViewFile *vf = data;
        gboolean refresh;
 
-       if (vf->refresh_idle_id != -1) return;
-
-       if (!vf->dir_fd) return;
+       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 */
 
+       if (!(type & interested) || vf->refresh_idle_id || !vf->dir_fd) return;
+       
        refresh = (fd == vf->dir_fd);
 
        if (!refresh)
@@ -855,7 +1051,7 @@ void vf_notify_cb(FileData *fd, NotifyType type, gpointer data)
                g_free(base);
                }
 
-       if (type == NOTIFY_TYPE_CHANGE && fd->change)
+       if ((type & NOTIFY_CHANGE) && fd->change)
                {
                if (!refresh && fd->change->dest)
                        {
@@ -874,6 +1070,7 @@ void vf_notify_cb(FileData *fd, NotifyType type, gpointer data)
        
        if (refresh)
                {
+               DEBUG_1("Notify vf: %s %04x", fd->path, type);
                vf_refresh_idle(vf);
                }
 }