Trim trailing white spaces.
[geeqie.git] / src / utilops.c
index 8ba30b1..8636e2e 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -14,7 +14,6 @@
 #include "main.h"
 #include "utilops.h"
 
-
 #include "cache.h"
 #include "cache_maint.h"
 #include "collect.h"
 #include "ui_misc.h"
 #include "ui_tabcomp.h"
 #include "editors.h"
+#include "metadata.h"
+#include "exif.h"
 
-/*
- *--------------------------------------------------------------------------
- * call these when names change, files move, deleted, etc.
- * so that any open windows are also updated
- *--------------------------------------------------------------------------
- */
-
-
-void file_maint_renamed(FileData *fd)
-{
-       cache_maint_moved(fd);
-       collection_maint_renamed(fd);
-
-       layout_maint_renamed(fd);
-       view_window_maint_moved(fd);
-       dupe_maint_renamed(fd);
-       search_maint_renamed(fd);
-}
-
-/* under most cases ignore_list should be NULL */
-void file_maint_removed(FileData *fd, GList *ignore_list)
-{
-       layout_maint_removed(fd, ignore_list);
-       view_window_maint_removed(fd, ignore_list);
-       dupe_maint_removed(fd);
-       search_maint_removed(fd);
-
-       collection_maint_removed(fd);
-       cache_maint_removed(fd);
-}
-
-/* special case for correct main window behavior */
-void file_maint_moved(FileData *fd, GList *ignore_list)
-{
-       cache_maint_moved(fd);
-       collection_maint_renamed(fd);
-
-       layout_maint_moved(fd, ignore_list);
-       view_window_maint_moved(fd);
-       dupe_maint_renamed(fd);
-       search_maint_renamed(fd);
-}
-
-void file_maint_copied(FileData *fd)
-{
-       cache_maint_copied(fd);
-}
-
-/*
- *--------------------------------------------------------------------------
- * The file manipulation dialogs
- *--------------------------------------------------------------------------
- */
-
-
-enum {
-       DIALOG_NEW_DIR,
-       DIALOG_COPY,
-       DIALOG_MOVE,
-       DIALOG_DELETE,
-       DIALOG_RENAME
-};
-
-typedef struct _FileDataMult FileDataMult;
-struct _FileDataMult
-{
-       gint confirm_all;
-       gint confirmed;
-       gint skip;
-       GList *source_list;
-       GList *source_next;
-       gchar *dest_base;
-       FileData *source_fd;
-       gchar *dest;
-       gint copy;
-
-       gint rename;
-       gint rename_auto;
-       gint rename_all;
-
-       GtkWidget *rename_box;
-       GtkWidget *rename_entry;
-       GtkWidget *rename_auto_box;
-
-       GtkWidget *yes_all_button;
-};
-
-typedef struct _FileDataSingle FileDataSingle;
-struct _FileDataSingle
-{
-       gint confirmed;
-       FileData *source_fd;
-       gchar *dest;
-       gint copy;
-
-       gint rename;
-       gint rename_auto;
+#define DIALOG_WIDTH 750
 
-       GtkWidget *rename_box;
-       GtkWidget *rename_entry;
-       GtkWidget *rename_auto_box;
-};
+static GdkPixbuf *file_util_get_error_icon(FileData *fd, GtkWidget *widget);
 
 /*
  *--------------------------------------------------------------------------
@@ -148,7 +50,7 @@ struct _FileDataSingle
 static void generic_dialog_add_image(GenericDialog *gd, GtkWidget *box,
                                     FileData *fd1, const gchar *header1,
                                     FileData *fd2, const gchar *header2,
-                                    gint show_filename)
+                                    gboolean show_filename)
 {
        ImageWindow *imd;
        GtkWidget *hbox = NULL;
@@ -254,13 +156,13 @@ static void generic_dialog_image_set(GenericDialog *gd, FileData *fd)
  */
 
 GenericDialog *file_util_gen_dlg(const gchar *title,
-                                const gchar *wmclass, const gchar *wmsubclass,
-                                GtkWidget *parent, gint auto_close,
+                                const gchar *role,
+                                GtkWidget *parent, gboolean auto_close,
                                 void (*cancel_cb)(GenericDialog *, gpointer), gpointer data)
 {
        GenericDialog *gd;
 
-       gd = generic_dialog_new(title, wmclass, wmsubclass, parent, auto_close, cancel_cb, data);
+       gd = generic_dialog_new(title, role, parent, auto_close, cancel_cb, data);
        if (options->place_dialogs_under_mouse)
                {
                gtk_window_set_position(GTK_WINDOW(gd->dialog), GTK_WIN_POS_MOUSE);
@@ -270,13 +172,13 @@ GenericDialog *file_util_gen_dlg(const gchar *title,
 }
 
 FileDialog *file_util_file_dlg(const gchar *title,
-                              const gchar *wmclass, const gchar *wmsubclass,
+                              const gchar *role,
                               GtkWidget *parent,
                               void (*cancel_cb)(FileDialog *, gpointer), gpointer data)
 {
        FileDialog *fdlg;
 
-       fdlg = file_dialog_new(title, wmclass, wmsubclass, parent, cancel_cb, data);
+       fdlg = file_dialog_new(title, role, parent, cancel_cb, data);
        if (options->place_dialogs_under_mouse)
                {
                gtk_window_set_position(GTK_WINDOW(GENERIC_DIALOG(fdlg)->dialog), GTK_WIN_POS_MOUSE);
@@ -299,7 +201,7 @@ GenericDialog *file_util_warning_dialog(const gchar *heading, const gchar *messa
 {
        GenericDialog *gd;
 
-       gd = file_util_gen_dlg(heading, GQ_WMCLASS, "warning", parent, TRUE, NULL, NULL);
+       gd = file_util_gen_dlg(heading, "warning", parent, TRUE, NULL, NULL);
        generic_dialog_add_message(gd, icon_stock_id, heading, message);
        generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, file_util_warning_dialog_ok_cb, TRUE);
        if (options->place_dialogs_under_mouse)
@@ -331,1008 +233,1088 @@ static gint filename_base_length(const gchar *name)
 }
 
 
-/*
- *--------------------------------------------------------------------------
- * Move and Copy routines
- *--------------------------------------------------------------------------
- */
 
-static gint copy_file_ext_cb(gpointer ed, gint flags, GList *list, gpointer data)
-{
-       if ((flags & EDITOR_ERROR_MASK) && !(flags & EDITOR_ERROR_SKIPPED))
-               {
-               FileData *fd = list->data;
-               gchar *title = _("Error copying file");
-               gchar *text = g_strdup_printf(_("%s\nUnable to copy file:\n%s\nto:\n%s"), editor_get_error_str(flags), fd->name, fd->change->dest);
-               file_util_warning_dialog(title, text, GTK_STOCK_DIALOG_ERROR, NULL);
-               g_free(text);
-               }
-       while (list)
-               {
-               FileData *fd = list->data;
-               if (!(flags & EDITOR_ERROR_MASK))
-                       file_maint_copied(fd);
-               file_data_change_info_free(NULL, fd);
-               list = list->next;
-               }
-       return EDITOR_CB_CONTINUE;
-}
 
+typedef enum {
+       UTILITY_TYPE_COPY,
+       UTILITY_TYPE_MOVE,
+       UTILITY_TYPE_RENAME,
+       UTILITY_TYPE_RENAME_FOLDER,
+       UTILITY_TYPE_EDITOR,
+       UTILITY_TYPE_FILTER,
+       UTILITY_TYPE_DELETE,
+       UTILITY_TYPE_DELETE_LINK,
+       UTILITY_TYPE_DELETE_FOLDER,
+       UTILITY_TYPE_CREATE_FOLDER,
+       UTILITY_TYPE_WRITE_METADATA
+} UtilityType;
+
+typedef enum {
+       UTILITY_PHASE_START = 0,
+       UTILITY_PHASE_ENTERING,
+       UTILITY_PHASE_CHECKED,
+       UTILITY_PHASE_DONE,
+       UTILITY_PHASE_CANCEL,
+       UTILITY_PHASE_DISCARD
+} UtilityPhase;
 
-gint copy_file_ext(FileData *fd)
-{
-       gint ok;
-       g_assert(fd->change);
-       if (options->editor_command[CMD_COPY])
-               {
-               ok = !start_editor_from_file_full(CMD_COPY, fd, copy_file_ext_cb, NULL);
-               if (ok) return ok; /* that's all for now, let's continue in callback */
-               }
-       else
-               ok = copy_file(fd->change->source, fd->change->dest);
+enum {
+       UTILITY_RENAME = 0,
+       UTILITY_RENAME_AUTO,
+       UTILITY_RENAME_FORMATTED
+};
 
-       if (ok)
-               {
-               file_maint_copied(fd);
-               }
+typedef struct _UtilityDataMessages UtilityDataMessages;
+struct _UtilityDataMessages {
+       gchar *title;
+       gchar *question;
+       gchar *desc_flist;
+       gchar *desc_source_fd;
+       gchar *fail;
+};
 
-       file_data_change_info_free(NULL, fd);
+typedef struct _UtilityData UtilityData;
 
-       return ok;
-}
+struct _UtilityData {
+       UtilityType type;
+       UtilityPhase phase;
+       
+       FileData *dir_fd;
+       GList *content_list;
+       GList *flist;
+       
+       FileData *sel_fd;
+
+       GtkWidget *parent;
+       GenericDialog *gd;
+       FileDialog *fdlg;
+       
+       guint update_idle_id; /* event source id */
+       guint perform_idle_id; /* event source id */
+
+       gboolean with_sidecars; /* operate on grouped or single files; TRUE = use file_data_sc_, FALSE = use file_data_ functions */
+       
+       /* alternative dialog parts */
+       GtkWidget *notebook;
+
+       UtilityDataMessages messages;
+
+       /* helper entries for various modes */
+       GtkWidget *rename_entry;
+       GtkWidget *rename_label;
+       GtkWidget *auto_entry_front;
+       GtkWidget *auto_entry_end;
+       GtkWidget *auto_spin_start;
+       GtkWidget *auto_spin_pad;
+       GtkWidget *format_entry;
+       GtkWidget *format_spin;
+
+       GtkWidget *listview;
+
+
+       gchar *dest_path;
+
+       /* data for the operation itself, internal or external */
+       gboolean external; /* TRUE for external command, FALSE for internal */
+       
+       gchar *external_command;
+       gpointer resume_data;
+       
+       FileUtilDoneFunc done_func;
+       void (*details_func)(UtilityData *ud, FileData *fd);
+       gboolean (*finalize_func)(FileData *fd);
+       gboolean (*discard_func)(FileData *fd);
+       gpointer done_data;
+};
+
+enum {
+       UTILITY_COLUMN_FD = 0,
+       UTILITY_COLUMN_PIXBUF,
+       UTILITY_COLUMN_PATH,
+       UTILITY_COLUMN_NAME,
+       UTILITY_COLUMN_SIDECARS,
+       UTILITY_COLUMN_DEST_PATH,
+       UTILITY_COLUMN_DEST_NAME,
+       UTILITY_COLUMN_COUNT
+};
+
+typedef struct _UtilityDelayData UtilityDelayData;
+
+struct _UtilityDelayData {
+       UtilityType type;
+       UtilityPhase phase;
+       GList *flist;
+       gchar *dest_path;
+       gchar *editor_key;
+       GtkWidget *parent;
+       guint idle_id; /* event source id */
+       };
 
-static gint move_file_ext_cb(gpointer ed, gint flags, GList *list, gpointer data)
+static gboolean file_util_write_metadata_first(UtilityType type, UtilityPhase phase, GList *flist, const gchar *dest_path, const gchar *editor_key, GtkWidget *parent);
+
+#define UTILITY_LIST_MIN_WIDTH  250
+#define UTILITY_LIST_MIN_HEIGHT 150
+
+/* thumbnail spec has a max depth of 4 (.thumb??/fail/appname/??.png) */
+#define UTILITY_DELETE_MAX_DEPTH 5
+
+static UtilityData *file_util_data_new(UtilityType type)
 {
-       if ((flags & EDITOR_ERROR_MASK) && !(flags & EDITOR_ERROR_SKIPPED))
-               {
-               FileData *fd = list->data;
-               gchar *title = _("Error moving file");
-               gchar *text = g_strdup_printf(_("%s\nUnable to move file:\n%s\nto:\n%s"), editor_get_error_str(flags), fd->name, fd->change->dest);
-               file_util_warning_dialog(title, text, GTK_STOCK_DIALOG_ERROR, NULL);
-               g_free(text);
-               }
-       while (list)
-               {
-               FileData *fd = list->data;
-               if (!(flags & EDITOR_ERROR_MASK))
-                       {
-                       file_data_sc_apply_ci(fd);
-                       file_maint_moved(fd, NULL);
-                       }
-               file_data_change_info_free(NULL, fd);
-               list = list->next;
-               }
-       return EDITOR_CB_CONTINUE;
+       UtilityData *ud;
 
+       ud = g_new0(UtilityData, 1);
+       
+       ud->type = type;
+       ud->phase = UTILITY_PHASE_START;
+       
+       return ud;
 }
 
+static void file_util_data_free(UtilityData *ud)
+{
+       if (!ud) return;
+
+       if (ud->update_idle_id) g_source_remove(ud->update_idle_id);
+       if (ud->perform_idle_id) g_source_remove(ud->perform_idle_id);
 
-gint move_file_ext(FileData *fd)
+       file_data_unref(ud->dir_fd);
+       filelist_free(ud->content_list);
+       filelist_free(ud->flist);
+
+       if (ud->gd) generic_dialog_close(ud->gd);
+       
+       g_free(ud->dest_path);
+       g_free(ud->external_command);
+
+       g_free(ud);
+}
+
+static GtkTreeViewColumn *file_util_dialog_add_list_column(GtkWidget *view, const gchar *text, gboolean image, gint n)
 {
-       gint ok;
-       g_assert(fd->change);
-       if (options->editor_command[CMD_MOVE])
+       GtkTreeViewColumn *column;
+       GtkCellRenderer *renderer;
+
+       column = gtk_tree_view_column_new();
+       gtk_tree_view_column_set_title(column, text);
+       gtk_tree_view_column_set_min_width(column, 4);
+       if (image)
                {
-               ok = !start_editor_from_file_full(CMD_MOVE, fd, move_file_ext_cb, NULL);
-               if (ok) return ok; /* that's all for now, let's continue in callback */
+               gtk_tree_view_column_set_min_width(column, 20);
+               gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
+               renderer = gtk_cell_renderer_pixbuf_new();
+               gtk_tree_view_column_pack_start(column, renderer, TRUE);
+               gtk_tree_view_column_add_attribute(column, renderer, "pixbuf", n);
                }
        else
-               ok = move_file(fd->change->source, fd->change->dest);
-
-       if (ok)
                {
-               file_data_sc_apply_ci(fd);
-               file_maint_moved(fd, NULL);
+               gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+               renderer = gtk_cell_renderer_text_new();
+               gtk_tree_view_column_pack_start(column, renderer, TRUE);
+               gtk_tree_view_column_add_attribute(column, renderer, "text", n);
                }
+       gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
 
-       file_data_change_info_free(NULL, fd);
-
-       return ok;
+       return column;
 }
 
-static gint rename_file_ext_cb(gpointer ed, gint flags, GList *list, gpointer data)
+static void file_util_dialog_list_select(GtkWidget *view, gint n)
 {
-       if ((flags & EDITOR_ERROR_MASK) && !(flags & EDITOR_ERROR_SKIPPED))
-               {
-               FileData *fd = list->data;
-               gchar *title = _("Error renaming file");
-               gchar *text = g_strdup_printf(_("%s\nUnable to rename file:\n%s\nto:\n%s"), editor_get_error_str(flags), fd->name, fd->change->dest);
-               file_util_warning_dialog(title, text, GTK_STOCK_DIALOG_ERROR, NULL);
-               g_free(text);
-               }
-       while (list)
+       GtkTreeModel *store;
+       GtkTreeIter iter;
+       GtkTreeSelection *selection;
+
+       store = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+       if (gtk_tree_model_iter_nth_child(store, &iter, NULL, n))
                {
-               FileData *fd = list->data;
-               if (!(flags & EDITOR_ERROR_MASK))
-                       {
-                       file_data_sc_apply_ci(fd);
-                       file_maint_renamed(fd);
-                       }
-               file_data_change_info_free(NULL, fd);
-               list = list->next;
+               selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
+               gtk_tree_selection_select_iter(selection, &iter);
                }
-       return EDITOR_CB_CONTINUE;
 }
 
-gint rename_file_ext(FileData *fd)
+static GtkWidget *file_util_dialog_add_list(GtkWidget *box, GList *list, gboolean full_paths, gboolean with_sidecars)
 {
-       gint ok;
-       g_assert(fd->change);
-       if (options->editor_command[CMD_RENAME])
+       GtkWidget *scrolled;
+       GtkWidget *view;
+       GtkListStore *store;
+
+       scrolled = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
+                                      GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       gtk_box_pack_start(GTK_BOX(box), scrolled, TRUE, TRUE, 0);
+       gtk_widget_show(scrolled);
+
+       store = gtk_list_store_new(UTILITY_COLUMN_COUNT, G_TYPE_POINTER, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+       view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+       g_object_unref(store);
+
+       gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), TRUE);
+       gtk_tree_view_set_enable_search(GTK_TREE_VIEW(view), FALSE);
+
+       file_util_dialog_add_list_column(view, "", TRUE, UTILITY_COLUMN_PIXBUF);
+
+       if (full_paths)
                {
-               ok = !start_editor_from_file_full(CMD_RENAME, fd, rename_file_ext_cb, NULL);
-               if (ok) return ok; /* that's all for now, let's continue in callback */
+               file_util_dialog_add_list_column(view, _("Path"), FALSE, UTILITY_COLUMN_PATH);
                }
        else
-               ok = rename_file(fd->change->source, fd->change->dest);
-
-       if (ok)
                {
-               file_data_sc_apply_ci(fd);
-               file_maint_renamed(fd);
+               file_util_dialog_add_list_column(view, _("Name"), FALSE, UTILITY_COLUMN_NAME);
                }
 
-       file_data_change_info_free(NULL, fd);
+       gtk_widget_set_size_request(view, UTILITY_LIST_MIN_WIDTH, UTILITY_LIST_MIN_HEIGHT);
+       gtk_container_add(GTK_CONTAINER(scrolled), view);
+       gtk_widget_show(view);
 
-       return ok;
+       while (list)
+               {
+               FileData *fd = list->data;
+               GtkTreeIter iter;
+               gchar *sidecars;
+               
+               sidecars = with_sidecars ? file_data_sc_list_to_string(fd) : NULL;
+               GdkPixbuf *icon = file_util_get_error_icon(fd, view);
+               gtk_list_store_append(store, &iter);
+               gtk_list_store_set(store, &iter,
+                                  UTILITY_COLUMN_FD, fd,
+                                  UTILITY_COLUMN_PIXBUF, icon,
+                                  UTILITY_COLUMN_PATH, fd->path,
+                                  UTILITY_COLUMN_NAME, fd->name,
+                                  UTILITY_COLUMN_SIDECARS, sidecars,
+                                  UTILITY_COLUMN_DEST_PATH, fd->change ? fd->change->dest : "error",
+                                  UTILITY_COLUMN_DEST_NAME, fd->change ? filename_from_path(fd->change->dest) : "error",
+                                  -1);
+               g_free(sidecars);
+
+               list = list->next;
+               }
+
+       return view;
 }
 
 
-/*
- * Multi file move
- */
+static gboolean file_util_perform_ci_internal(gpointer data);
+void file_util_dialog_run(UtilityData *ud);
+static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GList *list, gpointer data);
+
+/* call file_util_perform_ci_internal or start_editor_from_filelist_full */
 
-static FileDataMult *file_data_multiple_new(GList *source_list, const gchar *dest, gint copy)
+
+static void file_util_resume_cb(GenericDialog *gd, gpointer data)
 {
-       FileDataMult *fdm = g_new0(FileDataMult, 1);
-       fdm->confirm_all = FALSE;
-       fdm->confirmed = FALSE;
-       fdm->skip = FALSE;
-       fdm->source_list = source_list;
-       fdm->source_next = fdm->source_list;
-       fdm->dest_base = g_strdup(dest);
-       fdm->source_fd = NULL;
-       fdm->dest = NULL;
-       fdm->copy = copy;
-       return fdm;
+       UtilityData *ud = data;
+       if (ud->external)
+               editor_resume(ud->resume_data);
+       else
+               file_util_perform_ci_internal(ud);
 }
 
-static void file_data_multiple_free(FileDataMult *fdm)
+static void file_util_abort_cb(GenericDialog *gd, gpointer data)
 {
-       filelist_free(fdm->source_list);
-       g_free(fdm->dest_base);
-       g_free(fdm->dest);
-       g_free(fdm);
+       UtilityData *ud = data;
+       if (ud->external)
+               editor_skip(ud->resume_data);
+       else
+               file_util_perform_ci_cb(NULL, EDITOR_ERROR_SKIPPED, ud->flist, ud);
+
 }
 
-static void file_util_move_multiple(FileDataMult *fdm);
 
-static void file_util_move_multiple_ok_cb(GenericDialog *gd, gpointer data)
+static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GList *list, gpointer data)
 {
-       FileDataMult *fdm = data;
-
-       fdm->confirmed = TRUE;
+       UtilityData *ud = data;
+       gint ret = EDITOR_CB_CONTINUE;
 
-       if (fdm->rename_auto)
+       ud->resume_data = resume_data;
+       
+       if (EDITOR_ERRORS_BUT_SKIPPED(flags))
                {
-               gchar *buf;
+               GString *msg = g_string_new(editor_get_error_str(flags));
+               GenericDialog *d;
+               g_string_append(msg, "\n");
+               g_string_append(msg, ud->messages.fail);
+               g_string_append(msg, "\n");
+               while (list)
+                       {
+                       FileData *fd = list->data;
 
-               buf = unique_filename_simple(fdm->dest);
-               if (buf)
+                       g_string_append(msg, fd->path);
+                       g_string_append(msg, "\n");
+                       list = list->next;
+                       }
+               if (resume_data)
                        {
-                       g_free(fdm->dest);
-                       fdm->dest = buf;
+                       g_string_append(msg, _("\n Continue multiple file operation?"));
+                       d = file_util_gen_dlg(ud->messages.fail, "dlg_confirm",
+                                             NULL, TRUE,
+                                             file_util_abort_cb, ud);
+
+                       generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, NULL, msg->str);
+
+                       generic_dialog_add_button(d, GTK_STOCK_GO_FORWARD, _("Co_ntinue"),
+                                                 file_util_resume_cb, TRUE);
+                       gtk_widget_show(d->dialog);
+                       ret = EDITOR_CB_SUSPEND;
                        }
                else
                        {
-                       /* unique failed? well, return to the overwrite prompt :( */
-                       fdm->confirmed = FALSE;
+                       file_util_warning_dialog(ud->messages.fail, msg->str, GTK_STOCK_DIALOG_ERROR, NULL);
                        }
+               g_string_free(msg, TRUE);
                }
-       else if (fdm->rename)
+
+
+       while (list)  /* be careful, file_util_perform_ci_internal can pass ud->flist as list */
                {
-               const gchar *name;
+               FileData *fd = list->data;
+               list = list->next;
 
-               name = gtk_entry_get_text(GTK_ENTRY(fdm->rename_entry));
-               if (strlen(name) == 0 ||
-                   strcmp(name, fdm->source_fd->name) == 0)
+               if (!EDITOR_ERRORS(flags)) /* files were successfully deleted, call the maint functions */
                        {
-                       fdm->confirmed = FALSE;
+                       if (ud->with_sidecars)
+                               file_data_sc_apply_ci(fd);
+                       else
+                               file_data_apply_ci(fd);
                        }
-               else
+               
+               ud->flist = g_list_remove(ud->flist, fd);
+               
+               if (ud->finalize_func)
                        {
-                       g_free(fdm->dest);
-                       fdm->dest = g_build_filename(fdm->dest_base, name, NULL);
-                       fdm->confirmed = !isname(fdm->dest);
+                       ud->finalize_func(fd);
                        }
-               }
 
-       file_util_move_multiple(fdm);
+               if (ud->with_sidecars)
+                       file_data_sc_free_ci(fd);
+               else
+                       file_data_free_ci(fd);
+               file_data_unref(fd);
+               }
+               
+       if (!resume_data) /* end of the list */
+               {
+               ud->phase = UTILITY_PHASE_DONE;
+               file_util_dialog_run(ud);
+               }
+       
+       return ret;
 }
 
-static void file_util_move_multiple_all_cb(GenericDialog *gd, gpointer data)
-{
-       FileDataMult *fdm = data;
-
-       fdm->confirm_all = TRUE;
 
-       if (fdm->rename_auto) fdm->rename_all = TRUE;
+/*
+ * Perform the operation described by FileDataChangeInfo on all files in the list
+ * it is an alternative to start_editor_from_filelist_full, it should use similar interface
+ */
 
-       file_util_move_multiple(fdm);
-}
 
-static void file_util_move_multiple_skip_cb(GenericDialog *gd, gpointer data)
+static gboolean file_util_perform_ci_internal(gpointer data)
 {
-       FileDataMult *fdm = data;
+       UtilityData *ud = data;
 
-       fdm->skip = TRUE;
-       fdm->confirmed = TRUE;
+       if (!ud->perform_idle_id)
+               {
+               /* this function was called directly
+                  just setup idle callback and wait until we are called again
+               */
+               
+               /* this is removed when ud is destroyed */
+               ud->perform_idle_id = g_idle_add(file_util_perform_ci_internal, ud);
+               return TRUE;
+               }
 
-       file_util_move_multiple(fdm);
-}
-
-static void file_util_move_multiple_skip_all_cb(GenericDialog *gd, gpointer data)
-{
-       FileDataMult *fdm = data;
-
-       fdm->skip = TRUE;
-       fdm->confirm_all = TRUE;
-       file_util_move_multiple(fdm);
-}
-
-static void file_util_move_multiple_continue_cb(GenericDialog *gd, gpointer data)
-{
-       FileDataMult *fdm = data;
-
-       fdm->confirmed = TRUE;
-       file_util_move_multiple(fdm);
-}
-
-static void file_util_move_multiple_cancel_cb(GenericDialog *gd, gpointer data)
-{
-       FileDataMult *fdm = data;
-
-       file_data_multiple_free(fdm);
-}
-
-/* rename option */
-
-static void file_util_move_multiple_rename_auto_cb(GtkWidget *widget, gpointer data)
-{
-       GenericDialog *gd = data;
-       FileDataMult *fdm;
-
-       fdm = gd->data;
-
-       fdm->rename_auto = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-       gtk_widget_set_sensitive(fdm->rename_box, !fdm->rename_auto);
-       gtk_widget_set_sensitive(fdm->rename_entry, (!fdm->rename_auto && fdm->rename));
-
-       if (fdm->rename_auto)
-               {
-               gchar *preview;
-
-               preview = unique_filename_simple(fdm->dest);
-               if (preview) gtk_entry_set_text(GTK_ENTRY(fdm->rename_entry), filename_from_path(preview));
-               g_free(preview);
-               }
-
-       gtk_widget_set_sensitive(fdm->yes_all_button, (fdm->rename_auto || !fdm->rename));
-}
-
-static void file_util_move_multiple_rename_cb(GtkWidget *widget, gpointer data)
-{
-       GenericDialog *gd = data;
-       FileDataMult *fdm;
-
-       fdm = gd->data;
-
-       fdm->rename = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-       gtk_widget_set_sensitive(fdm->rename_entry, fdm->rename);
-       gtk_widget_set_sensitive(fdm->yes_all_button, !fdm->rename);
-
-       if (fdm->rename)
+       g_assert(ud->flist);
+       
+       if (ud->flist)
                {
-               const gchar *name;
-
-               gtk_widget_grab_focus(fdm->rename_entry);
-
-               name = gtk_entry_get_text(GTK_ENTRY(fdm->rename_entry));
-               gtk_editable_select_region(GTK_EDITABLE(fdm->rename_entry), 0, filename_base_length(name));
+               gint ret;
+               
+               /* take a single entry each time, this allows better control over the operation */
+               GList *single_entry = g_list_append(NULL, ud->flist->data);
+               gboolean last = !ud->flist->next;
+               EditorFlags status = EDITOR_ERROR_STATUS;
+       
+               if (ud->with_sidecars ? file_data_sc_perform_ci(single_entry->data)
+                                     : file_data_perform_ci(single_entry->data))
+                       status = 0; /* OK */
+               
+               ret = file_util_perform_ci_cb(GINT_TO_POINTER(!last), status, single_entry, ud);
+               g_list_free(single_entry);
+               
+               if (ret == EDITOR_CB_SUSPEND || last) return FALSE;
+               
+               if (ret == EDITOR_CB_SKIP)
+                       {
+                       file_util_perform_ci_cb(NULL, EDITOR_ERROR_SKIPPED, ud->flist, ud);
+                       return FALSE;
+                       }
                }
+       
+       return TRUE;
 }
 
-static GenericDialog *file_util_move_multiple_confirm_dialog(FileDataMult *fdm)
-{
-       GenericDialog *gd;
-       GtkWidget *hbox;
-
-       gd = file_util_gen_dlg(_("Overwrite file"), GQ_WMCLASS, "dlg_confirm",
-                               NULL, TRUE,
-                               file_util_move_multiple_cancel_cb, fdm);
-
-       generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
-                                  _("Overwrite file?"),
-                                  _("Replace existing file with new file."));
-       pref_spacer(gd->vbox, 0);
-
-       generic_dialog_add_button(gd, GTK_STOCK_YES, _("_Overwrite"), file_util_move_multiple_ok_cb, TRUE);
-       fdm->yes_all_button = generic_dialog_add_button(gd, NULL, _("Overwrite _all"),
-                                                       file_util_move_multiple_all_cb, FALSE);
-       generic_dialog_add_button(gd, GTK_STOCK_GOTO_LAST, _("S_kip all"), file_util_move_multiple_skip_all_cb, FALSE);
-       generic_dialog_add_button(gd, GTK_STOCK_GO_FORWARD, _("_Skip"), file_util_move_multiple_skip_cb, FALSE);
-       generic_dialog_add_image(gd, NULL, file_data_new_simple(fdm->dest), _("Existing file"), fdm->source_fd, _("New file"), TRUE);
-
-       /* rename option */
-
-       fdm->rename = FALSE;
-       fdm->rename_all = FALSE;
-       fdm->rename_auto = FALSE;
-
-       hbox = pref_box_new(gd->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
-
-       fdm->rename_auto_box = gtk_check_button_new_with_label(_("Auto rename"));
-       g_signal_connect(G_OBJECT(fdm->rename_auto_box), "clicked",
-                        G_CALLBACK(file_util_move_multiple_rename_auto_cb), gd);
-       gtk_box_pack_start(GTK_BOX(hbox), fdm->rename_auto_box, FALSE, FALSE, 0);
-       gtk_widget_show(fdm->rename_auto_box);
-
-       hbox = pref_box_new(gd->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
-
-       fdm->rename_box = gtk_check_button_new_with_label(_("Rename"));
-       g_signal_connect(G_OBJECT(fdm->rename_box), "clicked",
-                        G_CALLBACK(file_util_move_multiple_rename_cb), gd);
-       gtk_box_pack_start(GTK_BOX(hbox), fdm->rename_box, FALSE, FALSE, 0);
-       gtk_widget_show(fdm->rename_box);
-
-       fdm->rename_entry = gtk_entry_new();
-       gtk_entry_set_text(GTK_ENTRY(fdm->rename_entry), filename_from_path(fdm->dest));
-       gtk_widget_set_sensitive(fdm->rename_entry, FALSE);
-       gtk_box_pack_start(GTK_BOX(hbox), fdm->rename_entry, TRUE, TRUE, 0);
-       gtk_widget_show(fdm->rename_entry);
-
-       return gd;
-}
-
-static void file_util_move_multiple(FileDataMult *fdm)
+static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolean ext_result)
 {
-       while (fdm->dest || fdm->source_next)
+       switch (ud->type)
                {
-               gint success = FALSE;
-               gint skip_file = FALSE;
-
-               if (!fdm->dest)
-                       {
-                       GList *work = fdm->source_next;
-                       fdm->source_fd = work->data;
-                       fdm->dest = g_build_filename(fdm->dest_base, fdm->source_fd->name, NULL);
-                       fdm->source_next = work->next;
-                       fdm->confirmed = FALSE;
-                       }
-
-               if (fdm->dest && fdm->source_fd && strcmp(fdm->dest, fdm->source_fd->name) == 0)
+               case UTILITY_TYPE_DELETE_LINK:
                        {
-                       if (!fdm->confirmed)
+                       g_assert(ud->dir_fd->sidecar_files == NULL); // directories should not have sidecars
+                       if ((internal && file_data_perform_ci(ud->dir_fd)) ||
+                           (!internal && ext_result))
+                               {
+                               file_data_apply_ci(ud->dir_fd);
+                               }
+                       else
                                {
-                               GenericDialog *gd;
-                               const gchar *title;
                                gchar *text;
 
-                               if (fdm->copy)
-                                       {
-                                       title = _("Source to copy matches destination");
-                                       text = g_strdup_printf(_("Unable to copy file:\n%s\nto itself."), fdm->dest);
-                                       }
-                               else
-                                       {
-                                       title = _("Source to move matches destination");
-                                       text = g_strdup_printf(_("Unable to move file:\n%s\nto itself."), fdm->dest);
-                                       }
-
-                               gd = file_util_gen_dlg(title, GQ_WMCLASS, "dlg_confirm",
-                                                       NULL, TRUE,
-                                                       file_util_move_multiple_cancel_cb, fdm);
-                               generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING, title, text);
+                               text = g_strdup_printf("%s:\n\n%s", ud->messages.fail, ud->dir_fd->path);
+                               file_util_warning_dialog(ud->messages.fail, text, GTK_STOCK_DIALOG_ERROR, NULL);
                                g_free(text);
-                               generic_dialog_add_button(gd, GTK_STOCK_GO_FORWARD, _("Co_ntinue"),
-                                                        file_util_move_multiple_continue_cb, TRUE);
-
-                               gtk_widget_show(gd->dialog);
-                               return;
                                }
-                       skip_file = TRUE;
+                       file_data_free_ci(ud->dir_fd);
+                       break;
                        }
-               else if (isfile(fdm->dest))
+               case UTILITY_TYPE_DELETE_FOLDER:
                        {
-                       if (!fdm->confirmed && !fdm->confirm_all)
+                       FileData *fail = NULL;
+                       GList *work;
+                       work = ud->content_list;
+                       while (work)
                                {
-                               GenericDialog *gd;
+                               FileData *fd;
 
-                               gd = file_util_move_multiple_confirm_dialog(fdm);
-                               gtk_widget_show(gd->dialog);
-                               return;
+                               fd = work->data;
+                               work = work->next;
+                               
+                               if (!fail)
+                                       {
+                                       if ((internal && file_data_sc_perform_ci(fd)) ||
+                                           (!internal && ext_result))
+                                               {
+                                               file_data_sc_apply_ci(fd);
+                                               }
+                                       else
+                                               {
+                                               if (internal) fail = file_data_ref(fd);
+                                               }
+                                       }
+                               file_data_sc_free_ci(fd);
                                }
-                       if (fdm->skip) skip_file = TRUE;
-                       }
-
-               if (skip_file)
-                       {
-                       success = TRUE;
-                       if (!fdm->confirm_all) fdm->skip = FALSE;
-                       }
-               else
-                       {
-                       gint try = TRUE;
 
-                       if (fdm->confirm_all && fdm->rename_all && isfile(fdm->dest))
+                       if (!fail)
                                {
-                               gchar *buf;
-                               buf = unique_filename_simple(fdm->dest);
-                               if (buf)
+                               g_assert(ud->dir_fd->sidecar_files == NULL); // directories should not have sidecars
+                               if ((internal && file_data_sc_perform_ci(ud->dir_fd)) ||
+                                   (!internal && ext_result))
                                        {
-                                       g_free(fdm->dest);
-                                       fdm->dest = buf;
+                                       file_data_apply_ci(ud->dir_fd);
                                        }
                                else
                                        {
-                                       try = FALSE;
+                                       fail = file_data_ref(ud->dir_fd);
                                        }
                                }
-                       if (try)
+                       
+                       if (fail)
                                {
-                               if (fdm->copy)
-                                       {
-                                       if (file_data_add_change_info(fdm->source_fd, FILEDATA_CHANGE_COPY, fdm->source_fd->path, fdm->dest) &&
-                                           copy_file_ext(fdm->source_fd))
-                                               {
-                                               success = TRUE;
-                                               }
-                                       }
-                               else
+                               gchar *text;
+                               GenericDialog *gd;
+
+                               text = g_strdup_printf("%s:\n\n%s", ud->messages.fail, ud->dir_fd->path);
+                               gd = file_util_warning_dialog(ud->messages.fail, text, GTK_STOCK_DIALOG_ERROR, NULL);
+                               g_free(text);
+
+                               if (fail != ud->dir_fd)
                                        {
-                                       if (file_data_add_change_info(fdm->source_fd, FILEDATA_CHANGE_MOVE, fdm->source_fd->path, fdm->dest) &&
-                                           move_file_ext(fdm->source_fd))
-                                               {
-                                               success = TRUE;
-                                               }
+                                       pref_spacer(gd->vbox, PREF_PAD_GROUP);
+                                       text = g_strdup_printf(_("Removal of folder contents failed at this file:\n\n%s"),
+                                                               fail->path);
+                                       pref_label_new(gd->vbox, text);
+                                       g_free(text);
                                        }
 
+                               file_data_unref(fail);
                                }
+                       break;
                        }
-               if (!success)
+               case UTILITY_TYPE_RENAME_FOLDER:
                        {
-                       GenericDialog *gd;
-                       const gchar *title;
-                       gchar *text;
+                       FileData *fail = NULL;
+                       GList *work;
+                       g_assert(ud->dir_fd->sidecar_files == NULL); // directories should not have sidecars
 
-                       if (fdm->copy)
+                       if ((internal && file_data_sc_perform_ci(ud->dir_fd)) ||
+                           (!internal && ext_result))
                                {
-                               title = _("Error copying file");
-                               text = g_strdup_printf(_("Unable to copy file:\n%s\nto:\n%s\nduring multiple file copy."), fdm->source_fd->path, fdm->dest);
+                               file_data_sc_apply_ci(ud->dir_fd);
                                }
                        else
                                {
-                               title = _("Error moving file");
-                               text = g_strdup_printf(_("Unable to move file:\n%s\nto:\n%s\nduring multiple file move."), fdm->source_fd->path, fdm->dest);
+                               fail = file_data_ref(ud->dir_fd);
                                }
-                       gd = file_util_gen_dlg(title, GQ_WMCLASS, "dlg_confirm",
-                                               NULL, TRUE,
-                                               file_util_move_multiple_cancel_cb, fdm);
-                       generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING, title, text);
-                       g_free(text);
+                       
 
-                       generic_dialog_add_button(gd, GTK_STOCK_GO_FORWARD, _("Co_ntinue"),
-                                                 file_util_move_multiple_continue_cb, TRUE);
-                       gtk_widget_show(gd->dialog);
-                       }
+                       work = ud->content_list;
+                       while (work)
+                               {
+                               FileData *fd;
 
-               g_free(fdm->dest);
-               fdm->dest = NULL;
+                               fd = work->data;
+                               work = work->next;
+                               
+                               if (!fail)
+                                       {
+                                       file_data_sc_apply_ci(fd);
+                                       }
+                               file_data_sc_free_ci(fd);
+                               }
+                       
+                       if (fail)
+                               {
+                               gchar *text;
 
-               if (!success) return;
-               }
-/*
-       if (fdm->source_list)
-               file_util_do_move_list(fdm->source_list, fdm->copy);
-       else
-               {
-               GList *list = g_list_append(NULL, file_data_ref(fdm->source_fd));
-               file_util_do_move_list(list, fdm->copy);
-               filelist_free(list);
-               }
-*/
-       file_data_multiple_free(fdm);
-}
+                               text = g_strdup_printf("%s:\n\n%s", ud->messages.fail, ud->dir_fd->path);
+                               (void) file_util_warning_dialog(ud->messages.fail, text, GTK_STOCK_DIALOG_ERROR, NULL);
+                               g_free(text);
 
-/*
- * Single file move
- */
+                               file_data_unref(fail);
+                               }
+                       break;
+                       }
+               case UTILITY_TYPE_CREATE_FOLDER:
+                       {
+                       if ((internal && mkdir_utf8(ud->dir_fd->path, 0755)) ||
+                           (!internal && ext_result))
+                               {
+                               file_data_check_changed_files(ud->dir_fd); /* this will update the FileData and send notification */
+                               }
+                       else
+                               {
+                               gchar *text;
 
-static FileDataSingle *file_data_single_new(FileData *source_fd, const gchar *dest, gint copy)
-{
-       FileDataSingle *fds = g_new0(FileDataSingle, 1);
-       fds->confirmed = FALSE;
-       fds->source_fd = file_data_ref(source_fd);
-       fds->dest = g_strdup(dest);
-       fds->copy = copy;
-       return fds;
+                               text = g_strdup_printf("%s:\n\n%s", ud->messages.fail, ud->dir_fd->path);
+                               (void) file_util_warning_dialog(ud->messages.fail, text, GTK_STOCK_DIALOG_ERROR, NULL);
+                               g_free(text);
+                               }
+                       
+                       break;
+                       }
+               default:
+                       g_warning("unhandled operation");
+               }
+       ud->phase = UTILITY_PHASE_DONE;
+       file_util_dialog_run(ud);
 }
 
-static void file_data_single_free(FileDataSingle *fds)
+static gint file_util_perform_ci_dir_cb(gpointer resume_data, EditorFlags flags, GList *list, gpointer data)
 {
-       file_data_unref(fds->source_fd);
-       g_free(fds->dest);
-       g_free(fds);
+       UtilityData *ud = data;
+       file_util_perform_ci_dir(ud, FALSE, !EDITOR_ERRORS_BUT_SKIPPED(flags));
+       return EDITOR_CB_CONTINUE; /* does not matter, there was just single directory */
 }
 
-static void file_util_move_single(FileDataSingle *fds);
-
-static void file_util_move_single_ok_cb(GenericDialog *gd, gpointer data)
+void file_util_perform_ci(UtilityData *ud)
 {
-       FileDataSingle *fds = data;
-
-       fds->confirmed = TRUE;
-
-       if (fds->rename_auto)
+       switch (ud->type)
                {
-               gchar *buf;
+               case UTILITY_TYPE_COPY:
+                       ud->external_command = g_strdup(CMD_COPY);
+                       break;
+               case UTILITY_TYPE_MOVE:
+                       ud->external_command = g_strdup(CMD_MOVE);
+                       break;
+               case UTILITY_TYPE_RENAME:
+               case UTILITY_TYPE_RENAME_FOLDER:
+                       ud->external_command = g_strdup(CMD_RENAME);
+                       break;
+               case UTILITY_TYPE_DELETE:
+               case UTILITY_TYPE_DELETE_LINK:
+               case UTILITY_TYPE_DELETE_FOLDER:
+                       ud->external_command = g_strdup(CMD_DELETE);
+                       break;
+               case UTILITY_TYPE_CREATE_FOLDER:
+                       ud->external_command = g_strdup(CMD_FOLDER);
+                       break;
+               case UTILITY_TYPE_FILTER:
+               case UTILITY_TYPE_EDITOR:
+                       g_assert(ud->external_command != NULL); /* it should be already set */
+                       break;
+               case UTILITY_TYPE_WRITE_METADATA:
+                       ud->external_command = NULL;
+               }
 
-               buf = unique_filename_simple(fds->dest);
-               if (buf)
+       if (is_valid_editor_command(ud->external_command))
+               {
+               EditorFlags flags;
+               
+               ud->external = TRUE;
+               
+               if (ud->dir_fd)
                        {
-                       g_free(fds->dest);
-                       fds->dest = buf;
+                       flags = start_editor_from_file_full(ud->external_command, ud->dir_fd, file_util_perform_ci_dir_cb, ud);
                        }
                else
                        {
-                       /* unique failed? well, return to the overwrite prompt :( */
-                       fds->confirmed = FALSE;
+                       if (editor_blocks_file(ud->external_command))
+                               {
+                               DEBUG_1("Starting %s and waiting for results", ud->external_command);
+                               flags = start_editor_from_filelist_full(ud->external_command, ud->flist, NULL, file_util_perform_ci_cb, ud);
+                               }
+                       else
+                               {
+                               /* start the editor without callback and finish the operation internally */
+                               DEBUG_1("Starting %s and finishing the operation", ud->external_command);
+                               flags = start_editor_from_filelist(ud->external_command, ud->flist);
+                               file_util_perform_ci_internal(ud);
+                               }
+                       }
+
+               if (EDITOR_ERRORS(flags))
+                       {
+                       gchar *text = g_strdup_printf(_("%s\nUnable to start external command.\n"), editor_get_error_str(flags));
+                       file_util_warning_dialog(ud->messages.fail, text, GTK_STOCK_DIALOG_ERROR, NULL);
+                       g_free(text);
                        }
                }
-       else if (fds->rename)
+       else
                {
-               const gchar *name;
-
-               name = gtk_entry_get_text(GTK_ENTRY(fds->rename_entry));
-               if (strlen(name) == 0 ||
-                   strcmp(name, fds->source_fd->name) == 0)
+               ud->external = FALSE;
+               if (ud->dir_fd)
                        {
-                       fds->confirmed = FALSE;
+                       file_util_perform_ci_dir(ud, TRUE, FALSE);
                        }
                else
                        {
-                       gchar *base;
-
-                       base = remove_level_from_path(fds->dest);
-                       g_free(fds->dest);
-                       fds->dest = g_build_filename(base, name, NULL);
-                       fds->confirmed = !isname(fds->dest);
-
-                       g_free(base);
+                       file_util_perform_ci_internal(ud);
                        }
                }
-
-       file_util_move_single(fds);
-}
-
-static void file_util_move_single_cancel_cb(GenericDialog *gd, gpointer data)
-{
-       FileDataSingle *fds = data;
-
-       file_data_single_free(fds);
 }
 
-static void file_util_move_single_rename_auto_cb(GtkWidget *widget, gpointer data)
+static GdkPixbuf *file_util_get_error_icon(FileData *fd, GtkWidget *widget)
 {
-       GenericDialog *gd = data;
-       FileDataSingle *fds;
-
-       fds = gd->data;
-
-       fds->rename_auto = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-       gtk_widget_set_sensitive(fds->rename_box, !fds->rename_auto);
-       gtk_widget_set_sensitive(fds->rename_entry, (!fds->rename_auto && fds->rename));
-
-       if (fds->rename_auto)
+       static GdkPixbuf *pb_warning;
+       static GdkPixbuf *pb_error;
+       static GdkPixbuf *pb_apply;
+       gint error;
+       
+       if (!pb_warning)
                {
-               gchar *preview;
-
-               preview = unique_filename_simple(fds->dest);
-               if (preview) gtk_entry_set_text(GTK_ENTRY(fds->rename_entry), filename_from_path(preview));
-               g_free(preview);
+               pb_warning = gtk_widget_render_icon(widget, GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU, NULL);
                }
-}
-
-static void file_util_move_single_rename_cb(GtkWidget *widget, gpointer data)
-{
-       GenericDialog *gd = data;
-       FileDataSingle *fds;
-
-       fds = gd->data;
 
-       fds->rename = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-       gtk_widget_set_sensitive(fds->rename_entry, fds->rename);
-
-       if (fds->rename)
+       if (!pb_error)
                {
-               const gchar *name;
-
-               gtk_widget_grab_focus(fds->rename_entry);
+               pb_error = gtk_widget_render_icon(widget, GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_MENU, NULL);
+               }
 
-               name = gtk_entry_get_text(GTK_ENTRY(fds->rename_entry));
-               gtk_editable_select_region(GTK_EDITABLE(fds->rename_entry), 0, filename_base_length(name));
+       if (!pb_apply)
+               {
+               pb_apply = gtk_widget_render_icon(widget, GTK_STOCK_APPLY, GTK_ICON_SIZE_MENU, NULL);
                }
-}
+       
+       error = file_data_sc_verify_ci(fd);
+       
+       if (!error) return pb_apply;
 
-static void file_util_move_single(FileDataSingle *fds)
-{
-       if (fds->dest && fds->source_fd && strcmp(fds->dest, fds->source_fd->name) == 0)
+       if (error & CHANGE_ERROR_MASK)
                {
-               file_util_warning_dialog(_("Source matches destination"),
-                                        _("Source and destination are the same, operation cancelled."),
-                                        GTK_STOCK_DIALOG_INFO, NULL);
+               return pb_error;
                }
-       else if (isfile(fds->dest) && !fds->confirmed)
+       else
                {
-               GenericDialog *gd;
-               GtkWidget *hbox;
-
-               gd = file_util_gen_dlg(_("Overwrite file"), GQ_WMCLASS, "dlg_confirm",
-                                       NULL, TRUE,
-                                       file_util_move_single_cancel_cb, fds);
-
-               generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
-                                          _("Overwrite file?"),
-                                          _("Replace existing file with new file."));
-               pref_spacer(gd->vbox, 0);
-
-               generic_dialog_add_button(gd, GTK_STOCK_OK, _("_Overwrite"), file_util_move_single_ok_cb, TRUE);
-               generic_dialog_add_image(gd, NULL, file_data_new_simple(fds->dest), _("Existing file"), fds->source_fd, _("New file"), TRUE);
-
-               /* rename option */
-
-               fds->rename = FALSE;
-               fds->rename_auto = FALSE;
-
-               hbox = pref_box_new(gd->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
-
-               fds->rename_auto_box = gtk_check_button_new_with_label(_("Auto rename"));
-               g_signal_connect(G_OBJECT(fds->rename_auto_box), "clicked",
-                                G_CALLBACK(file_util_move_single_rename_auto_cb), gd);
-               gtk_box_pack_start(GTK_BOX(hbox), fds->rename_auto_box, FALSE, FALSE, 0);
-               gtk_widget_show(fds->rename_auto_box);
-
-               hbox = pref_box_new(gd->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
+               return pb_warning;
+               }
+}
 
-               fds->rename_box = gtk_check_button_new_with_label(_("Rename"));
-               g_signal_connect(G_OBJECT(fds->rename_box), "clicked",
-                                G_CALLBACK(file_util_move_single_rename_cb), gd);
-               gtk_box_pack_start(GTK_BOX(hbox), fds->rename_box, FALSE, FALSE, 0);
-               gtk_widget_show(fds->rename_box);
+static void file_util_check_resume_cb(GenericDialog *gd, gpointer data)
+{
+       UtilityData *ud = data;
+       ud->phase = UTILITY_PHASE_CHECKED;
+       file_util_dialog_run(ud);
+}
 
-               fds->rename_entry = gtk_entry_new();
-               gtk_entry_set_text(GTK_ENTRY(fds->rename_entry), filename_from_path(fds->dest));
-               gtk_widget_set_sensitive(fds->rename_entry, FALSE);
-               gtk_box_pack_start(GTK_BOX(hbox), fds->rename_entry, TRUE, TRUE, 0);
-               gtk_widget_show(fds->rename_entry);
+static void file_util_check_abort_cb(GenericDialog *gd, gpointer data)
+{
+       UtilityData *ud = data;
+       ud->phase = UTILITY_PHASE_START;
+       file_util_dialog_run(ud);
+}
 
-               gtk_widget_show(gd->dialog);
-               return;
-               }
-       else
+void file_util_check_ci(UtilityData *ud)
+{
+       gint error = CHANGE_OK;
+       gchar *desc = NULL;
+       
+       if (ud->type != UTILITY_TYPE_CREATE_FOLDER &&
+           ud->type != UTILITY_TYPE_RENAME_FOLDER)
                {
-               gint success = FALSE;
-               if (fds->copy)
+               if (ud->dest_path && !isdir(ud->dest_path))
                        {
-                       if (file_data_add_change_info(fds->source_fd, FILEDATA_CHANGE_COPY, fds->source_fd->path, fds->dest) &&
-                           copy_file_ext(fds->source_fd))
-                               {
-                               success = TRUE;
-                               }
+                       error = CHANGE_GENERIC_ERROR;
+                       desc = g_strdup_printf(_("%s is not a directory"), ud->dest_path);
                        }
-               else
+               else if (ud->dir_fd)
                        {
-                       if (file_data_add_change_info(fds->source_fd, FILEDATA_CHANGE_MOVE, fds->source_fd->path, fds->dest) &&
-                           move_file_ext(fds->source_fd))
-                               {
-                               success = TRUE;
-                               }
+                       g_assert(ud->dir_fd->sidecar_files == NULL); // directories should not have sidecars
+                       error = file_data_verify_ci(ud->dir_fd);
+                       if (error) desc = file_data_get_error_string(error);
                        }
-               if (!success)
+               else
                        {
-                       gchar *title;
-                       gchar *text;
-                       if (fds->copy)
-                               {
-                               title = _("Error copying file");
-                               text = g_strdup_printf(_("Unable to copy file:\n%s\nto:\n%s"), fds->source_fd->name, fds->dest);
-                               }
-                       else
-                               {
-                               title = _("Error moving file");
-                               text = g_strdup_printf(_("Unable to move file:\n%s\nto:\n%s"), fds->source_fd->name, fds->dest);
-                               }
-                       file_util_warning_dialog(title, text, GTK_STOCK_DIALOG_ERROR, NULL);
-                       g_free(text);
+                       error = file_data_verify_ci_list(ud->flist, &desc, ud->with_sidecars);
                        }
                }
 
-       file_data_single_free(fds);
-}
+       if (!error)
+               {
+               ud->phase = UTILITY_PHASE_CHECKED;
+               file_util_dialog_run(ud);
+               return;
+               }
 
-/*
- * file move dialog
- */
+       if (!(error & CHANGE_ERROR_MASK))
+               {
+               /* just a warning */
+               GenericDialog *d;
 
-static void file_util_move_do(FileDialog *fdlg)
-{
-       file_dialog_sync_history(fdlg, TRUE);
+               d = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
+                                       ud->parent, TRUE,
+                                       file_util_check_abort_cb, ud);
 
-       if (fdlg->multiple_files)
-               {
-               file_util_move_multiple(file_data_multiple_new(fdlg->source_list, fdlg->dest_path, fdlg->type));
-               fdlg->source_list = NULL;
+               generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("Really continue?"), desc);
+
+               generic_dialog_add_button(d, GTK_STOCK_GO_FORWARD, _("Co_ntinue"),
+                                         file_util_check_resume_cb, TRUE);
+               gtk_widget_show(d->dialog);
                }
        else
                {
-               if (isdir(fdlg->dest_path))
-                       {
-                       gchar *buf = g_build_filename(fdlg->dest_path, fdlg->source_fd->name, NULL);
-                       gtk_entry_set_text(GTK_ENTRY(fdlg->entry), buf);
-                       g_free(buf);
-                       }
-               file_util_move_single(file_data_single_new(fdlg->source_fd, fdlg->dest_path, fdlg->type));
-               }
+               /* fatal error */
+               GenericDialog *d;
 
-       file_dialog_close(fdlg);
-}
+               d = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
+                                       ud->parent, TRUE,
+                                       file_util_check_abort_cb, ud);
+               generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("This operation can't continue:"), desc);
 
-static void file_util_move_check(FileDialog *fdlg)
-{
-       if (fdlg->dest_path && strcmp(fdlg->dest_path, "~") == 0)
-               {
-               gtk_entry_set_text(GTK_ENTRY(fdlg->entry), homedir());
+               gtk_widget_show(d->dialog);
                }
+       g_free(desc);
+}
 
-       if (fdlg->multiple_files && !isdir(fdlg->dest_path))
-               {
-               if (isfile(fdlg->dest_path))
-                       {
-                       file_util_warning_dialog(_("Invalid destination"),
-                                                _("When operating with multiple files, please select\na folder, not a file."),
-                                                GTK_STOCK_DIALOG_INFO, NULL);
-                       }
-               else
-                       file_util_warning_dialog(_("Invalid folder"),
-                                                _("Please select an existing folder."),
-                                                GTK_STOCK_DIALOG_INFO, NULL);
-               return;
-               }
 
-       if (!fdlg->dest_path || fdlg->dest_path[0] != '/')
-               {
-               if (fdlg->source_fd)
-                       {
-                       gchar *base;
-                       gchar *path;
 
-                       base = remove_level_from_path(fdlg->source_fd->path);
-                       path = g_build_filename(base, fdlg->dest_path, NULL);
 
-                       gtk_entry_set_text(GTK_ENTRY(fdlg->entry), path);
 
-                       g_free(path);
-                       g_free(base);
-                       }
-               return;
-               }
+static void file_util_cancel_cb(GenericDialog *gd, gpointer data)
+{
+       UtilityData *ud = data;
+       
+       generic_dialog_close(gd);
 
-       file_util_move_do(fdlg);
+       ud->gd = NULL;
+       
+       ud->phase = UTILITY_PHASE_CANCEL;
+       file_util_dialog_run(ud);
 }
 
-static void file_util_move_cb(FileDialog *fdlg, gpointer data)
+static void file_util_discard_cb(GenericDialog *gd, gpointer data)
 {
-       file_util_move_check(fdlg);
-}
+       UtilityData *ud = data;
+       
+       generic_dialog_close(gd);
 
-static void file_util_move_cancel_cb(FileDialog *fdlg, gpointer data)
-{
-       file_dialog_close(fdlg);
+       ud->gd = NULL;
+       
+       ud->phase = UTILITY_PHASE_DISCARD;
+       file_util_dialog_run(ud);
 }
 
-static void real_file_util_move(FileData *source_fd, GList *source_list,
-                               const gchar *dest_path, gint copy, GtkWidget *parent)
+static void file_util_ok_cb(GenericDialog *gd, gpointer data)
 {
-       FileDialog *fdlg;
-       GtkWidget *label;
-       FileData *fd = NULL;
-       gint multiple;
-       const gchar *text;
-       gchar *title;
-       const gchar *op_text;
-       const gchar *stock_id;
+       UtilityData *ud = data;
+       
+       generic_dialog_close(gd);
+       
+       ud->gd = NULL;
 
-       if (!source_fd && !source_list) return;
+       file_util_dialog_run(ud);
+}
 
-       if (source_fd)
+static void file_util_fdlg_cancel_cb(FileDialog *fdlg, gpointer data)
+{
+       UtilityData *ud = data;
+       
+       file_dialog_close(fdlg);
+
+       ud->fdlg = NULL;
+       
+       ud->phase = UTILITY_PHASE_CANCEL;
+       file_util_dialog_run(ud);
+}
+
+static void file_util_dest_folder_update_path(UtilityData *ud)
+{
+       g_free(ud->dest_path);
+       ud->dest_path = g_strdup(gtk_entry_get_text(GTK_ENTRY(ud->fdlg->entry)));
+       
+       switch (ud->type)
                {
-               fd = file_data_ref(source_fd);
-               multiple = FALSE;
+               case UTILITY_TYPE_COPY:
+                       file_data_sc_update_ci_copy_list(ud->flist, ud->dest_path);
+               case UTILITY_TYPE_MOVE:
+                       file_data_sc_update_ci_move_list(ud->flist, ud->dest_path);
+                       break;
+               case UTILITY_TYPE_FILTER:
+               case UTILITY_TYPE_EDITOR:
+                       file_data_sc_update_ci_unspecified_list(ud->flist, ud->dest_path);
+                       break;
+               case UTILITY_TYPE_CREATE_FOLDER:
+                       file_data_unref(ud->dir_fd);
+                       ud->dir_fd = file_data_new_dir(ud->dest_path);
+                       break;
+               case UTILITY_TYPE_DELETE:
+               case UTILITY_TYPE_DELETE_LINK:
+               case UTILITY_TYPE_DELETE_FOLDER:
+               case UTILITY_TYPE_RENAME:
+               case UTILITY_TYPE_RENAME_FOLDER:
+               case UTILITY_TYPE_WRITE_METADATA:
+                       g_warning("unhandled operation");
                }
-       else if (source_list->next)
+}
+
+static void file_util_fdlg_ok_cb(FileDialog *fdlg, gpointer data)
+{
+       UtilityData *ud = data;
+       
+       file_util_dest_folder_update_path(ud);
+       if (isdir(ud->dest_path)) file_dialog_sync_history(fdlg, TRUE);
+       file_dialog_close(fdlg);
+       
+       ud->fdlg = NULL;
+
+       file_util_dialog_run(ud);
+}
+
+
+static void file_util_dest_folder_entry_cb(GtkWidget *entry, gpointer data)
+{
+       UtilityData *ud = data;
+       file_util_dest_folder_update_path(ud);
+}
+
+/* format: * = filename without extension, ## = number position, extension is kept */
+static gchar *file_util_rename_multiple_auto_format_name(const gchar *format, const gchar *name, gint n)
+{
+       gchar *new_name;
+       gchar *parsed;
+       const gchar *ext;
+       gchar *middle;
+       gchar *tmp;
+       gchar *pad_start;
+       gchar *pad_end;
+       gint padding;
+
+       if (!format || !name) return NULL;
+
+       tmp = g_strdup(format);
+       pad_start = strchr(tmp, '#');
+       if (pad_start)
                {
-               multiple = TRUE;
+               pad_end = pad_start;
+               padding = 0;
+               while (*pad_end == '#')
+                       {
+                       pad_end++;
+                       padding++;
+                       }
+               *pad_start = '\0';
+
+               parsed = g_strdup_printf("%s%0*d%s", tmp, padding, n, pad_end);
+               g_free(tmp);
                }
        else
                {
-               fd = file_data_ref(source_list->data);
-               filelist_free(source_list);
-               source_list = NULL;
-               multiple = FALSE;
+               parsed = tmp;
                }
 
-       if (copy)
+       ext = extension_from_path(name);
+
+       middle = strchr(parsed, '*');
+       if (middle)
                {
-               title = _("Copy");
-               op_text = _("_Copy");
-               if (fd)
-                       {
-                       text = _("Copy file");
-                       }
-               else
-                       {
-                       text = _("Copy multiple files");
-                       }
-               stock_id = GTK_STOCK_COPY;
+               gchar *base;
+
+               *middle = '\0';
+               middle++;
+
+               base = remove_extension_from_path(name);
+               new_name = g_strconcat(parsed, base, middle, ext, NULL);
+               g_free(base);
                }
        else
                {
-               title = _("Move");
-               op_text = _("_Move");
-               if (fd)
-                       {
-                       text = _("Move file");
-                       }
-               else
+               new_name = g_strconcat(parsed, ext, NULL);
+               }
+
+       g_free(parsed);
+
+       return new_name;
+}
+
+
+static void file_util_rename_preview_update(UtilityData *ud)
+{
+       GtkTreeModel *store;
+       GtkTreeSelection *selection;
+       GtkTreeIter iter;
+       const gchar *front;
+       const gchar *end;
+       const gchar *format;
+       gboolean valid;
+       gint start_n;
+       gint padding;
+       gint n;
+       gint mode;
+
+       mode = gtk_notebook_get_current_page(GTK_NOTEBOOK(ud->notebook));
+
+       if (mode == UTILITY_RENAME)
+               {
+               selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(ud->listview));
+               if (gtk_tree_selection_get_selected(selection, &store, &iter))
                        {
-                       text = _("Move multiple files");
+                       FileData *fd;
+                       const gchar *dest = gtk_entry_get_text(GTK_ENTRY(ud->rename_entry));
+                       
+                       gtk_tree_model_get(store, &iter, UTILITY_COLUMN_FD, &fd, -1);
+                       g_assert(ud->with_sidecars); /* sidecars must be renamed too, it would break the pairing otherwise */
+                       file_data_sc_update_ci_rename(fd, dest);
+                       gtk_list_store_set(GTK_LIST_STORE(store), &iter,
+                                          UTILITY_COLUMN_PIXBUF, file_util_get_error_icon(fd, ud->listview),
+                                          UTILITY_COLUMN_DEST_PATH, fd->change->dest,
+                                          UTILITY_COLUMN_DEST_NAME, filename_from_path(fd->change->dest),
+                                          -1);
                        }
-               stock_id = GTK_STOCK_OK;
+               return;
                }
 
-       fdlg = file_util_file_dlg(title, GQ_WMCLASS, "dlg_copymove", parent,
-                               file_util_move_cancel_cb, NULL);
-       generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, text, NULL);
 
-       if (fd)
-               {
-               GtkWidget *box;
+       front = gtk_entry_get_text(GTK_ENTRY(ud->auto_entry_front));
+       end = gtk_entry_get_text(GTK_ENTRY(ud->auto_entry_end));
+       padding = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(ud->auto_spin_pad));
 
-               box = pref_box_new(GENERIC_DIALOG(fdlg)->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
-               pref_label_new(box, _("File name:"));
-               pref_label_new(box, fd->name);
+       format = gtk_entry_get_text(GTK_ENTRY(ud->format_entry));
+
+       if (mode == UTILITY_RENAME_FORMATTED)
+               {
+               start_n = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(ud->format_spin));
+               }
+       else
+               {
+               start_n = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(ud->auto_spin_start));
                }
 
-       label = pref_label_new(GENERIC_DIALOG(fdlg)->vbox, _("Choose the destination folder."));
-       gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-       pref_spacer(GENERIC_DIALOG(fdlg)->vbox, 0);
+       store = gtk_tree_view_get_model(GTK_TREE_VIEW(ud->listview));
+       n = start_n;
+       valid = gtk_tree_model_get_iter_first(store, &iter);
+       while (valid)
+               {
+               gchar *dest;
+               FileData *fd;
+               gtk_tree_model_get(store, &iter, UTILITY_COLUMN_FD, &fd, -1);
 
-       file_dialog_add_button(fdlg, stock_id, op_text, file_util_move_cb, TRUE);
+               if (mode == UTILITY_RENAME_FORMATTED)
+                       {
+                       dest = file_util_rename_multiple_auto_format_name(format, fd->name, n);
+                       }
+               else
+                       {
+                       dest = g_strdup_printf("%s%0*d%s", front, padding, n, end);
+                       }
 
-       file_dialog_add_path_widgets(fdlg, NULL, dest_path, "move_copy", NULL, NULL);
+               g_assert(ud->with_sidecars); /* sidecars must be renamed too, it would break the pairing otherwise */
+               file_data_sc_update_ci_rename(fd, dest);
+               gtk_list_store_set(GTK_LIST_STORE(store), &iter,
+                                  UTILITY_COLUMN_PIXBUF, file_util_get_error_icon(fd, ud->listview),
+                                  UTILITY_COLUMN_DEST_PATH, fd->change->dest,
+                                  UTILITY_COLUMN_DEST_NAME, filename_from_path(fd->change->dest),
+                                  -1);
+               g_free(dest);
 
-       fdlg->type = copy;
-       fdlg->source_fd = fd;
-       fdlg->source_list = source_list;
-       fdlg->multiple_files = multiple;
+               n++;
+               valid = gtk_tree_model_iter_next(store, &iter);
+               }
 
-       gtk_widget_show(GENERIC_DIALOG(fdlg)->dialog);
 }
 
-void file_util_move(FileData *source_fd, GList *source_list, const gchar *dest_path, GtkWidget *parent)
+static void file_util_rename_preview_entry_cb(GtkWidget *entry, gpointer data)
 {
-       real_file_util_move(source_fd, source_list, dest_path, FALSE, parent);
+       UtilityData *ud = data;
+       file_util_rename_preview_update(ud);
 }
 
-void file_util_copy(FileData *source_fd, GList *source_list, const gchar *dest_path, GtkWidget *parent)
+static void file_util_rename_preview_adj_cb(GtkWidget *spin, gpointer data)
 {
-       real_file_util_move(source_fd, source_list, dest_path, TRUE, parent);
+       UtilityData *ud = data;
+       file_util_rename_preview_update(ud);
 }
 
-void file_util_copy_path_to_clipboard(FileData *fd)
+static gboolean file_util_rename_idle_cb(gpointer data)
 {
-       GtkClipboard *clipboard;
+       UtilityData *ud = data;
 
-       if (!fd || !*fd->path) return;
+       file_util_rename_preview_update(ud);
 
-       clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
-       gtk_clipboard_set_text(clipboard, g_shell_quote(fd->path), -1);
+       ud->update_idle_id = 0;
+       return FALSE;
 }
 
-void file_util_copy_path_list_to_clipboard(GList *list)
+static void file_util_rename_preview_order_cb(GtkTreeModel *treemodel, GtkTreePath *tpath,
+                                             GtkTreeIter *iter, gpointer data)
 {
-       GtkClipboard *clipboard;
-       GList *work;
-       GString *new;
+       UtilityData *ud = data;
 
-       clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
-       
-       new = g_string_new("");
-       work = list;
-       while (work) {
-               FileData *fd = work->data;
-               work = work->next;
+       if (ud->update_idle_id) return;
 
-               if (!fd || !*fd->path) continue;
-       
-               g_string_append(new, g_shell_quote(fd->path));
-               if (work) g_string_append_c(new, ' ');
-               }
-       
-       gtk_clipboard_set_text(clipboard, new->str, new->len);
-       g_string_free(new, TRUE);
+       ud->update_idle_id = g_idle_add(file_util_rename_idle_cb, ud);
 }
 
-void file_util_move_simple(GList *list, const gchar *dest_path)
-{
-       if (!list) return;
-       if (!dest_path)
-               {
-               filelist_free(list);
-               return;
-               }
-
-       if (!list->next)
-               {
-               FileData *source_fd;
-               gchar *dest;
-
-               source_fd = list->data;
-               dest = g_build_filename(dest_path, source_fd->name, NULL);
-
-               file_util_move_single(file_data_single_new(source_fd, dest, FALSE));
-               g_free(dest);
-               filelist_free(list);
-               return;
-               }
-
-       file_util_move_multiple(file_data_multiple_new(list, dest_path, FALSE));
-}
 
-void file_util_copy_simple(GList *list, const gchar *dest_path)
+static gboolean file_util_preview_cb(GtkTreeSelection *selection, GtkTreeModel *store,
+                                    GtkTreePath *tpath, gboolean path_currently_selected,
+                                    gpointer data)
 {
-       if (!list) return;
-       if (!dest_path)
-               {
-               filelist_free(list);
-               return;
-               }
+       UtilityData *ud = data;
+       GtkTreeIter iter;
+       FileData *fd = NULL;
 
-       if (!list->next)
-               {
-               FileData *source_fd;
-               gchar *dest;
+       if (path_currently_selected ||
+           !gtk_tree_model_get_iter(store, &iter, tpath)) return TRUE;
 
-               source_fd = list->data;
-               dest = g_build_filename(dest_path, source_fd->name, NULL);
+       gtk_tree_model_get(store, &iter, UTILITY_COLUMN_FD, &fd, -1);
+       generic_dialog_image_set(ud->gd, fd);
+       
+       ud->sel_fd = fd;
+       
+       if (ud->type == UTILITY_TYPE_RENAME)
+               {
+               const gchar *name = filename_from_path(fd->change->dest);
 
-               file_util_move_single(file_data_single_new(source_fd, dest, TRUE));
-               g_free(dest);
-               filelist_free(list);
-               return;
+               gtk_widget_grab_focus(ud->rename_entry);
+               gtk_label_set_text(GTK_LABEL(ud->rename_label), fd->name);
+               g_signal_handlers_block_by_func(ud->rename_entry, G_CALLBACK(file_util_rename_preview_entry_cb), ud);
+               gtk_entry_set_text(GTK_ENTRY(ud->rename_entry), name);
+               gtk_editable_select_region(GTK_EDITABLE(ud->rename_entry), 0, filename_base_length(name));
+               g_signal_handlers_unblock_by_func(ud->rename_entry, G_CALLBACK(file_util_rename_preview_entry_cb), ud);
                }
 
-       file_util_move_multiple(file_data_multiple_new(list, dest_path, TRUE));
+       return TRUE;
 }
 
 
 
-/*
- *--------------------------------------------------------------------------
- * Delete routines
- *--------------------------------------------------------------------------
- */
-
 static void box_append_safe_delete_status(GenericDialog *gd)
 {
        GtkWidget *label;
@@ -1346,1960 +1328,1567 @@ static void box_append_safe_delete_status(GenericDialog *gd)
        gtk_widget_set_sensitive(label, FALSE);
 }
 
+static void file_util_details_cb(GenericDialog *gd, gpointer data)
+{
+       UtilityData *ud = data;
+       if (ud->details_func && ud->sel_fd)
+               {
+               ud->details_func(ud, ud->sel_fd);
+               }
+}
 
-static gint file_util_unlink(FileData *fd)
+static void file_util_dialog_init_simple_list(UtilityData *ud)
 {
-       if (!isfile(fd->path)) return FALSE;
+       GtkWidget *box;
+       GtkTreeSelection *selection;
+       gchar *dir_msg;
 
+       const gchar *stock_id;
 
-       if (!options->file_ops.safe_delete_enable)
+       /* FIXME: use ud->stock_id */
+       if (ud->type == UTILITY_TYPE_DELETE ||
+           ud->type == UTILITY_TYPE_DELETE_LINK ||
+           ud->type == UTILITY_TYPE_DELETE_FOLDER)
                {
-               return unlink_file(fd->path);
+               stock_id = GTK_STOCK_DELETE;
+               }
+       else
+               {
+               stock_id = GTK_STOCK_OK;
                }
 
-       return file_util_safe_unlink(fd->path);
-}
-
-/*
- * delete multiple files
- */
+       ud->gd = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
+                                  ud->parent, FALSE,  file_util_cancel_cb, ud);
+       if (ud->discard_func) generic_dialog_add_button(ud->gd, GTK_STOCK_REVERT_TO_SAVED, _("Discard changes"), file_util_discard_cb, FALSE);
+       if (ud->details_func) generic_dialog_add_button(ud->gd, GTK_STOCK_INFO, _("File details"), file_util_details_cb, FALSE);
 
-static void file_util_delete_multiple_ok_cb(GenericDialog *gd, gpointer data);
-static void file_util_delete_multiple_cancel_cb(GenericDialog *gd, gpointer data);
+       generic_dialog_add_button(ud->gd, stock_id, NULL, file_util_ok_cb, TRUE);
 
-static void file_util_delete_ext_ok_cb(GenericDialog *gd, gpointer data)
-{
-       editor_resume(data);
-}
+       if (ud->dir_fd)
+               {
+               dir_msg = g_strdup_printf("%s\n\n%s\n", ud->messages.desc_source_fd, ud->dir_fd->path);
+               }
+       else
+               {
+               dir_msg = g_strdup("");
+               }
+               
+       box = generic_dialog_add_message(ud->gd, GTK_STOCK_DIALOG_QUESTION,
+                                        ud->messages.question,
+                                        dir_msg);
 
-static void file_util_delete_ext_cancel_cb(GenericDialog *gd, gpointer data)
-{
-       editor_skip(data);
-}
+       g_free(dir_msg);
+       
+       box = pref_group_new(box, TRUE, ud->messages.desc_flist, GTK_ORIENTATION_HORIZONTAL);
 
+       ud->listview = file_util_dialog_add_list(box, ud->flist, FALSE, ud->with_sidecars);
+       if (ud->with_sidecars) file_util_dialog_add_list_column(ud->listview, _("Sidecars"), FALSE, UTILITY_COLUMN_SIDECARS);
 
-static gint file_util_delete_ext_cb(gpointer resume_data, gint flags, GList *list, gpointer data)
-{
-       gint ret = EDITOR_CB_CONTINUE;
-       if ((flags & EDITOR_ERROR_MASK) && !(flags & EDITOR_ERROR_SKIPPED))
-               {
-                       GString *msg = g_string_new(editor_get_error_str(flags));
-                       g_string_append(msg,_("\nUnable to delete file by external command:\n"));
-                       GenericDialog *d;
-                       while (list)
-                               {
-                               FileData *fd = list->data;
+       if (ud->type == UTILITY_TYPE_WRITE_METADATA) file_util_dialog_add_list_column(ud->listview, _("Write to file"), FALSE, UTILITY_COLUMN_DEST_NAME);
 
-                               g_string_append(msg, fd->path);
-                               g_string_append(msg, "\n");
-                               list = list->next;
-                               }
-                       if (resume_data)
-                               {
-                               g_string_append(msg, _("\n Continue multiple delete operation?"));
-                               d = file_util_gen_dlg(_("Delete failed"), GQ_WMCLASS, "dlg_confirm",
-                                                     NULL, TRUE,
-                                                     file_util_delete_ext_cancel_cb, resume_data);
+       selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(ud->listview));
+       gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
+       gtk_tree_selection_set_select_function(selection, file_util_preview_cb, ud, NULL);
 
-                               generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, NULL, msg->str);
+       generic_dialog_add_image(ud->gd, box, NULL, NULL, NULL, NULL, FALSE);
 
-                               generic_dialog_add_button(d, GTK_STOCK_GO_FORWARD, _("Co_ntinue"),
-                                                         file_util_delete_ext_ok_cb, TRUE);
-                               gtk_widget_show(d->dialog);
-                               ret = EDITOR_CB_SUSPEND;
-                               }
-                       else
-                               {
-                               file_util_warning_dialog(_("Delete failed"), msg->str, GTK_STOCK_DIALOG_ERROR, NULL);
-                               }
-                       g_string_free(msg, TRUE);
-               }
+       if (ud->type == UTILITY_TYPE_DELETE ||
+           ud->type == UTILITY_TYPE_DELETE_LINK ||
+           ud->type == UTILITY_TYPE_DELETE_FOLDER)
+               box_append_safe_delete_status(ud->gd);
 
+       gtk_widget_show(ud->gd->dialog);
 
-               {
-               while (list)
-                       {
-                       FileData *fd = list->data;
-                       if (flags & EDITOR_ERROR_MASK)
-                               /* an error occured -> no change -> delete change info */
-                               file_data_change_info_free(NULL, fd);
-                       else
-                               /* files were successfully deleted, call the maint functions and keep the change info forever */
-                               file_maint_removed(fd, list);
-                       list = list->next;
-                       }
-               }
-       return ret;
+       file_util_dialog_list_select(ud->listview, 0);
 }
 
-static void file_util_delete_multiple_ok_cb(GenericDialog *gd, gpointer data)
+static void file_util_dialog_init_dest_folder(UtilityData *ud)
 {
-       GList *source_list = data;
-       GList *work = source_list;
-       gboolean ok = TRUE;
+       FileDialog *fdlg;
+       GtkWidget *label;
+       const gchar *stock_id;
 
-       while (work)
+       if (ud->type == UTILITY_TYPE_COPY)
                {
-               FileData *fd = work->data;
-               if (fd->change) ok = FALSE; /* another operation in progress */
-               work = work->next;
+               stock_id = GTK_STOCK_COPY;
                }
-
-       if (!ok)
+       else
                {
-               file_util_warning_dialog(_("File deletion failed"), _("Another operation in progress.\n"), GTK_STOCK_DIALOG_ERROR, NULL);
-               filelist_free(source_list);
-               return;
+               stock_id = GTK_STOCK_OK;
                }
 
+       fdlg = file_util_file_dlg(ud->messages.title, "dlg_dest_folder", ud->parent,
+                                 file_util_fdlg_cancel_cb, ud);
+       
+       ud->fdlg = fdlg;
+       
+       generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, ud->messages.question, NULL);
 
-       if (options->editor_command[CMD_DELETE])
-               {
-               gint flags;
-               work = source_list;
-               while (work)
-                       {
-                       FileData *fd = work->data;
-                       file_data_add_change_info(fd, FILEDATA_CHANGE_DELETE, NULL, NULL);
-                       work = work->next;
-                       }
-
-               if ((flags = start_editor_from_filelist_full(CMD_DELETE, source_list, file_util_delete_ext_cb, NULL)))
-                       {
-                       gchar *text = g_strdup_printf(_("%s\nUnable to delete files by external command.\n"), editor_get_error_str(flags));
-                       file_util_warning_dialog(_("File deletion failed"), text, GTK_STOCK_DIALOG_ERROR, NULL);
-                       g_free(text);
-                       }
+       label = pref_label_new(GENERIC_DIALOG(fdlg)->vbox, _("Choose the destination folder."));
+       gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+       pref_spacer(GENERIC_DIALOG(fdlg)->vbox, 0);
 
-               filelist_free(source_list);
-               return;
-               }
+       file_dialog_add_button(fdlg, stock_id, ud->messages.title, file_util_fdlg_ok_cb, TRUE);
 
+       file_dialog_add_path_widgets(fdlg, NULL, ud->dest_path, "move_copy", NULL, NULL);
 
-       while (source_list)
-               {
-               FileData *fd = source_list->data;
+       g_signal_connect(G_OBJECT(fdlg->entry), "changed",
+                        G_CALLBACK(file_util_dest_folder_entry_cb), ud);
 
-               source_list = g_list_remove(source_list, fd);
+       gtk_widget_show(GENERIC_DIALOG(fdlg)->dialog);
+}
 
-               if (!file_util_unlink(fd))
-                       {
-                       if (source_list)
-                               {
-                               GenericDialog *d;
-                               gchar *text;
 
-                               d = file_util_gen_dlg(_("Delete failed"), GQ_WMCLASS, "dlg_confirm",
-                                                     NULL, TRUE,
-                                                     file_util_delete_multiple_cancel_cb, source_list);
+static GtkWidget *furm_simple_vlabel(GtkWidget *box, const gchar *text, gboolean expand)
+{
+       GtkWidget *vbox;
+       GtkWidget *label;
 
-                               text = g_strdup_printf(_("Unable to delete file:\n %s\n Continue multiple delete operation?"), fd->path);
-                               generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, NULL, text);
-                               g_free(text);
+       vbox = gtk_vbox_new(FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(box), vbox, expand, expand, 0);
+       gtk_widget_show(vbox);
 
-                               generic_dialog_add_button(d, GTK_STOCK_GO_FORWARD, _("Co_ntinue"),
-                                                         file_util_delete_multiple_ok_cb, TRUE);
-                               gtk_widget_show(d->dialog);
-                               }
-                       else
-                               {
-                               gchar *text;
+       label = gtk_label_new(text);
+       gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+       gtk_widget_show(label);
 
-                               text = g_strdup_printf(_("Unable to delete file:\n%s"), fd->path);
-                               file_util_warning_dialog(_("Delete failed"), text, GTK_STOCK_DIALOG_ERROR, NULL);
-                               g_free(text);
-                               }
-                       file_data_unref(fd);
-                       return;
-                       }
-               else
-                       {
-                       file_maint_removed(fd, source_list);
-                       }
-               file_data_unref(fd);
-               }
+       return vbox;
 }
 
-static void file_util_delete_multiple_cancel_cb(GenericDialog *gd, gpointer data)
+
+static void file_util_dialog_init_source_dest(UtilityData *ud)
 {
-       GList *source_list = data;
+       GtkTreeModel *store;
+       GtkTreeSelection *selection;
+       GtkWidget *box;
+       GtkWidget *hbox;
+       GtkWidget *box2;
+       GtkWidget *table;
+       GtkWidget *combo;
+       GtkWidget *page;
 
-       filelist_free(source_list);
-}
+       ud->gd = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
+                                  ud->parent, FALSE,  file_util_cancel_cb, ud);
 
-static void file_util_delete_multiple_review_skip(GenericDialog *gd, gint next)
-{
-       GtkWidget *button_back;
-       GtkWidget *button_next;
-       GtkWidget *button_label;
-       GList *list;
-       GList *list_point;
-       FileData *fd;
-       gchar *buf;
+       box = generic_dialog_add_message(ud->gd, NULL, ud->messages.question, NULL);
 
-       list = gd->data;
-       button_back = g_object_get_data(G_OBJECT(gd->dialog), "button_back");
-       button_next = g_object_get_data(G_OBJECT(gd->dialog), "button_next");
-       button_label = g_object_get_data(G_OBJECT(gd->dialog), "button_label");
-       list_point = g_object_get_data(G_OBJECT(gd->dialog), "list_point");
+       if (ud->discard_func) generic_dialog_add_button(ud->gd, GTK_STOCK_REVERT_TO_SAVED, _("Discard changes"), file_util_discard_cb, FALSE);
+       if (ud->details_func) generic_dialog_add_button(ud->gd, GTK_STOCK_INFO, _("File details"), file_util_details_cb, FALSE);
 
-       if (!list || !button_label) return;
+       generic_dialog_add_button(ud->gd, GTK_STOCK_OK, ud->messages.title, file_util_ok_cb, TRUE);
 
-       if (list_point)
-               {
-               if (next)
-                       {
-                       if (list_point->next) list_point = list_point->next;
-                       }
-               else
-                       {
-                       if (list_point->prev) list_point = list_point->prev;
-                       }
-               }
-       else
-               {
-               list_point = list;
-               }
+       box = pref_group_new(box, TRUE, ud->messages.desc_flist, GTK_ORIENTATION_HORIZONTAL);
 
-       if (!list_point) return;
+       ud->listview = file_util_dialog_add_list(box, ud->flist, FALSE, ud->with_sidecars);
+       file_util_dialog_add_list_column(ud->listview, _("Sidecars"), FALSE, UTILITY_COLUMN_SIDECARS);
 
-       fd = list_point->data;
-       buf = g_strdup_printf(_("File %d of %d"),
-                             g_list_index(list, (gpointer)fd) + 1,
-                             g_list_length(list));
-       gtk_label_set_text(GTK_LABEL(button_label), buf);
-       g_free(buf);
+       file_util_dialog_add_list_column(ud->listview, _("New name"), FALSE, UTILITY_COLUMN_DEST_NAME);
 
-       gtk_widget_set_sensitive(button_back, (list_point->prev != NULL) );
-       gtk_widget_set_sensitive(button_next, (list_point->next != NULL) );
+       selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(ud->listview));
+       gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_SINGLE);
+       gtk_tree_selection_set_select_function(selection, file_util_preview_cb, ud, NULL);
 
-       generic_dialog_image_set(gd, fd);
 
-       g_object_set_data(G_OBJECT(gd->dialog), "list_point", list_point);
-}
+//     column = file_util_rename_multiple_add_column(rd, _("Preview"), RENAME_COLUMN_PREVIEW);
+//     gtk_tree_view_column_set_visible(column, FALSE);
 
-static void file_util_delete_multiple_review_back(GtkWidget *button, gpointer data)
-{
-       GenericDialog *gd = data;
+       gtk_tree_view_set_reorderable(GTK_TREE_VIEW(ud->listview), TRUE);
+       
+       store = gtk_tree_view_get_model(GTK_TREE_VIEW(ud->listview));
+       g_signal_connect(G_OBJECT(store), "row_changed",
+                        G_CALLBACK(file_util_rename_preview_order_cb), ud);
+       gtk_widget_set_size_request(ud->listview, 300, 150);
 
-       file_util_delete_multiple_review_skip(gd, FALSE);
-}
+       generic_dialog_add_image(ud->gd, box, NULL, NULL, NULL, NULL, FALSE);
 
-static void file_util_delete_multiple_review_next(GtkWidget *button, gpointer data)
-{
-       GenericDialog *gd = data;
+//     gtk_container_add(GTK_CONTAINER(scrolled), view);
+       gtk_widget_show(ud->gd->dialog);
+
+
+       ud->notebook = gtk_notebook_new();
+       
+       gtk_box_pack_start(GTK_BOX(ud->gd->vbox), ud->notebook, FALSE, FALSE, 0);
+       gtk_widget_show(ud->notebook);
+       
+
+       page = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+       gtk_notebook_append_page(GTK_NOTEBOOK(ud->notebook), page, gtk_label_new(_("Manual rename")));
+       gtk_widget_show(page);
+       
+       table = pref_table_new(page, 2, 2, FALSE, FALSE);
+
+       pref_table_label(table, 0, 0, _("Original name:"), 1.0);
+       ud->rename_label = pref_table_label(table, 1, 0, "", 0.0);
+
+       pref_table_label(table, 0, 1, _("New name:"), 1.0);
+
+       ud->rename_entry = gtk_entry_new();
+       gtk_table_attach(GTK_TABLE(table), ud->rename_entry, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+       generic_dialog_attach_default(GENERIC_DIALOG(ud->gd), ud->rename_entry);
+       gtk_widget_grab_focus(ud->rename_entry);
+
+       g_signal_connect(G_OBJECT(ud->rename_entry), "changed",
+                        G_CALLBACK(file_util_rename_preview_entry_cb), ud);
+
+       gtk_widget_show(ud->rename_entry);
+
+       page = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+       gtk_notebook_append_page(GTK_NOTEBOOK(ud->notebook), page, gtk_label_new(_("Auto rename")));
+       gtk_widget_show(page);
+
+
+       hbox = pref_box_new(page, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
+
+       box2 = furm_simple_vlabel(hbox, _("Begin text"), TRUE);
+
+       combo = history_combo_new(&ud->auto_entry_front, "", "numerical_rename_prefix", -1);
+       g_signal_connect(G_OBJECT(ud->auto_entry_front), "changed",
+                        G_CALLBACK(file_util_rename_preview_entry_cb), ud);
+       gtk_box_pack_start(GTK_BOX(box2), combo, TRUE, TRUE, 0);
+       gtk_widget_show(combo);
+
+       box2 = furm_simple_vlabel(hbox, _("Start #"), FALSE);
+
+       ud->auto_spin_start = pref_spin_new(box2, NULL, NULL,
+                                           0.0, 1000000.0, 1.0, 0, 1.0,
+                                           G_CALLBACK(file_util_rename_preview_adj_cb), ud);
+
+       box2 = furm_simple_vlabel(hbox, _("End text"), TRUE);
+
+       combo = history_combo_new(&ud->auto_entry_end, "", "numerical_rename_suffix", -1);
+       g_signal_connect(G_OBJECT(ud->auto_entry_end), "changed",
+                        G_CALLBACK(file_util_rename_preview_entry_cb), ud);
+       gtk_box_pack_start(GTK_BOX(box2), combo, TRUE, TRUE, 0);
+       gtk_widget_show(combo);
+
+       ud->auto_spin_pad = pref_spin_new(page, _("Padding:"), NULL,
+                                         1.0, 8.0, 1.0, 0, 1.0,
+                                         G_CALLBACK(file_util_rename_preview_adj_cb), ud);
+
+       page = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+       gtk_notebook_append_page(GTK_NOTEBOOK(ud->notebook), page, gtk_label_new(_("Formatted rename")));
+       gtk_widget_show(page);
+
+       hbox = pref_box_new(page, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
+
+       box2 = furm_simple_vlabel(hbox, _("Format (* = original name, ## = numbers)"), TRUE);
+
+       combo = history_combo_new(&ud->format_entry, "", "auto_rename_format", -1);
+       g_signal_connect(G_OBJECT(ud->format_entry), "changed",
+                        G_CALLBACK(file_util_rename_preview_entry_cb), ud);
+       gtk_box_pack_start(GTK_BOX(box2), combo, TRUE, TRUE, 0);
+       gtk_widget_show(combo);
+
+       box2 = furm_simple_vlabel(hbox, _("Start #"), FALSE);
 
-       file_util_delete_multiple_review_skip(gd, TRUE);
+       ud->format_spin = pref_spin_new(box2, NULL, NULL,
+                                       0.0, 1000000.0, 1.0, 0, 1.0,
+                                       G_CALLBACK(file_util_rename_preview_adj_cb), ud);
+
+//     gtk_combo_box_set_active(GTK_COMBO_BOX(ud->combo_type), 0); /* callback will take care of the rest */
+
+       file_util_dialog_list_select(ud->listview, 0);
 }
 
-static void file_util_delete_multiple_review_button_cb(ImageWindow *imd, gint button, guint32 time,
-                                                      gdouble x, gdouble y, guint state, gpointer data)
+static void file_util_finalize_all(UtilityData *ud)
 {
-       if (button == MOUSE_BUTTON_LEFT)
-               {
-               file_util_delete_multiple_review_next(NULL, data);
-               }
-       else if (button == MOUSE_BUTTON_MIDDLE || button == MOUSE_BUTTON_RIGHT)
+       GList *work = ud->flist;
+       
+       if (ud->phase == UTILITY_PHASE_CANCEL) return;
+       if (ud->phase == UTILITY_PHASE_DONE && !ud->finalize_func) return;
+       if (ud->phase == UTILITY_PHASE_DISCARD && !ud->discard_func) return;
+       
+       while (work)
                {
-               file_util_delete_multiple_review_back(NULL, data);
+               FileData *fd = work->data;
+               work = work->next;
+               if (ud->phase == UTILITY_PHASE_DONE) ud->finalize_func(fd);
+               else if (ud->phase == UTILITY_PHASE_DISCARD) ud->discard_func(fd);
                }
 }
 
-static void file_util_delete_multiple_review_scroll_cb(ImageWindow *imd, GdkScrollDirection direction, guint32 time,
-                                                      gdouble x, gdouble y, guint state, gpointer data)
+static gboolean file_util_exclude_fd(UtilityData *ud, FileData *fd)
 {
-       if (direction == GDK_SCROLL_UP)
-               {
-               file_util_delete_multiple_review_back(NULL, data);
-               }
-       else if (direction == GDK_SCROLL_DOWN)
+       GtkTreeModel *store;
+       GtkTreeIter iter;
+       gboolean valid;
+
+       if (!g_list_find(ud->flist, fd)) return FALSE;
+
+       store = gtk_tree_view_get_model(GTK_TREE_VIEW(ud->listview));
+       valid = gtk_tree_model_get_iter_first(store, &iter);
+       while (valid)
                {
-               file_util_delete_multiple_review_next(NULL, data);
+               FileData *store_fd;
+               gtk_tree_model_get(store, &iter, UTILITY_COLUMN_FD, &store_fd, -1);
+
+               if (store_fd == fd)
+                       {
+                       gtk_list_store_remove(GTK_LIST_STORE(store), &iter);
+                       break;
+                       }
+               valid = gtk_tree_model_iter_next(store, &iter);
                }
+
+       ud->flist = g_list_remove(ud->flist, fd);
+
+       if (ud->with_sidecars)
+               file_data_sc_free_ci(fd);
+       else
+               file_data_free_ci(fd);
+       
+       file_data_unref(fd);
+       return TRUE;
 }
 
-static void file_util_delete_multiple(GList *source_list, GtkWidget *parent)
+void file_util_dialog_run(UtilityData *ud)
 {
-       if (!options->file_ops.confirm_delete)
+       switch (ud->phase)
                {
-               file_util_delete_multiple_ok_cb(NULL, source_list);
+               case UTILITY_PHASE_START:
+                       /* create the dialogs */
+                       switch (ud->type)
+                               {
+                               case UTILITY_TYPE_DELETE:
+                               case UTILITY_TYPE_DELETE_LINK:
+                               case UTILITY_TYPE_DELETE_FOLDER:
+                               case UTILITY_TYPE_EDITOR:
+                               case UTILITY_TYPE_WRITE_METADATA:
+                                       file_util_dialog_init_simple_list(ud);
+                                       break;
+                               case UTILITY_TYPE_RENAME:
+                                       file_util_dialog_init_source_dest(ud);
+                                       break;
+                               case UTILITY_TYPE_COPY:
+                               case UTILITY_TYPE_MOVE:
+                               case UTILITY_TYPE_FILTER:
+                               case UTILITY_TYPE_CREATE_FOLDER:
+                                       file_util_dialog_init_dest_folder(ud);
+                                       break;
+                               case UTILITY_TYPE_RENAME_FOLDER:
+                                       ud->phase = UTILITY_PHASE_CANCEL; /* FIXME - not handled for now */
+                                       file_util_dialog_run(ud);
+                                       return;
+                               }
+                       ud->phase = UTILITY_PHASE_ENTERING;
+                       break;
+               case UTILITY_PHASE_ENTERING:
+                       file_util_check_ci(ud);
+                       break;
+               
+                       ud->phase = UTILITY_PHASE_CHECKED;
+               case UTILITY_PHASE_CHECKED:
+                       file_util_perform_ci(ud);
+                       break;
+               case UTILITY_PHASE_CANCEL:
+               case UTILITY_PHASE_DONE:
+               case UTILITY_PHASE_DISCARD:
+
+                       file_util_finalize_all(ud);
+                       
+                       /* both DISCARD and DONE finishes the operation for good */
+                       if (ud->done_func)
+                               ud->done_func((ud->phase != UTILITY_PHASE_CANCEL), ud->dest_path, ud->done_data);
+                               
+                       if (ud->with_sidecars)
+                               file_data_sc_free_ci_list(ud->flist);
+                       else
+                               file_data_free_ci_list(ud->flist);
+                       
+                       /* directory content is always handled including sidecars */
+                       file_data_sc_free_ci_list(ud->content_list);
+                       
+                       if (ud->dir_fd) file_data_free_ci(ud->dir_fd);
+                       file_util_data_free(ud);
+                       break;
                }
-       else
-               {
-               GenericDialog *gd;
-               GtkWidget *hbox;
-               GtkWidget *button;
-               GtkWidget *label;
-               ImageWindow *imd;
-               gchar *buf;
-       
-               gd = file_util_gen_dlg(_("Delete files"), GQ_WMCLASS, "dlg_confirm", parent, TRUE,
-                                      file_util_delete_multiple_cancel_cb, source_list);
-
-               generic_dialog_add_message(gd, NULL, _("Delete multiple files"), NULL);
-
-               generic_dialog_add_image(gd, NULL, NULL, NULL, NULL, NULL, TRUE);
-               imd = g_object_get_data(G_OBJECT(gd->dialog), "img_image");
-               image_set_button_func(imd, file_util_delete_multiple_review_button_cb, gd);
-               image_set_scroll_func(imd, file_util_delete_multiple_review_scroll_cb, gd);
+}
 
-               hbox = pref_box_new(gd->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP);
 
-               button = pref_button_new(hbox, GTK_STOCK_GO_BACK, NULL, TRUE,
-                                        G_CALLBACK(file_util_delete_multiple_review_back), gd);
-               gtk_widget_set_sensitive(button, FALSE);
-               g_object_set_data(G_OBJECT(gd->dialog), "button_back", button);
 
-               button = pref_button_new(hbox, GTK_STOCK_GO_FORWARD, NULL, TRUE,
-                                        G_CALLBACK(file_util_delete_multiple_review_next), gd);
-               g_object_set_data(G_OBJECT(gd->dialog), "button_next", button);
 
-               buf = g_strdup_printf(_("Review %d files"), g_list_length(source_list) );
-               label = pref_label_new(hbox, buf);
-               g_free(buf);
-               g_object_set_data(G_OBJECT(gd->dialog), "button_label", label);
+static void file_util_warn_op_in_progress(const gchar *title)
+{
+       file_util_warning_dialog(title, _("Another operation in progress.\n"), GTK_STOCK_DIALOG_ERROR, NULL);
+}
 
-               box_append_safe_delete_status(gd);
+static void file_util_details_dialog_close_cb(GtkWidget *widget, gpointer data)
+{
+       gtk_widget_destroy(data);
 
-               generic_dialog_add_button(gd, GTK_STOCK_DELETE, NULL, file_util_delete_multiple_ok_cb, TRUE);
+}
 
-               gtk_widget_show(gd->dialog);
-               }
+static void file_util_details_dialog_destroy_cb(GtkWidget *widget, gpointer data)
+{
+       UtilityData *ud = data;
+       g_signal_handlers_disconnect_by_func(ud->gd->dialog, G_CALLBACK(file_util_details_dialog_close_cb), widget);
 }
 
-/*
- * delete single file
- */
 
-static void file_util_delete_ok_cb(GenericDialog *gd, gpointer data)
+static void file_util_details_dialog_ok_cb(GenericDialog *gd, gpointer data)
 {
-       FileData *fd = data;
+       /* no op */
+}
 
-       if (!file_data_add_change_info(fd, FILEDATA_CHANGE_DELETE, NULL, NULL))
+static void file_util_details_dialog_exclude(GenericDialog *gd, gpointer data, gboolean discard)
+{
+       UtilityData *ud = data;
+       FileData *fd = g_object_get_data(G_OBJECT(gd->dialog), "file_data");
+       
+       if (!fd) return;
+       file_util_exclude_fd(ud, fd);
+       
+       if (discard && ud->discard_func) ud->discard_func(fd);
+       
+       /* all files were excluded, this has the same effect as pressing the cancel button in the confirmation dialog*/
+       if (!ud->flist)
                {
-               file_util_warning_dialog(_("File deletion failed"), _("Another operation in progress.\n"), GTK_STOCK_DIALOG_ERROR, NULL);
-               file_data_unref(fd);
-               return;
+               /* both dialogs will be closed anyway, the signals would cause duplicate calls */
+               g_signal_handlers_disconnect_by_func(ud->gd->dialog, G_CALLBACK(file_util_details_dialog_close_cb), gd->dialog);
+               g_signal_handlers_disconnect_by_func(gd->dialog, G_CALLBACK(file_util_details_dialog_destroy_cb), ud);
+
+               file_util_cancel_cb(ud->gd, ud);
                }
+}
+
+static void file_util_details_dialog_exclude_cb(GenericDialog *gd, gpointer data)
+{
+       file_util_details_dialog_exclude(gd, data, FALSE);
+}
 
+static void file_util_details_dialog_discard_cb(GenericDialog *gd, gpointer data)
+{
+       file_util_details_dialog_exclude(gd, data, TRUE);
+}
 
-       if (options->editor_command[CMD_DELETE])
+static gchar *file_util_details_get_message(UtilityData *ud, FileData *fd, const gchar **stock_id)
+{
+       GString *message = g_string_new("");
+       gint error;
+       g_string_append_printf(message, _("File: '%s'\n"), fd->path);
+       
+       if (ud->with_sidecars && fd->sidecar_files)
                {
-               gint flags;
-               if ((flags = start_editor_from_file_full(CMD_DELETE, fd, file_util_delete_ext_cb, NULL)))
+               GList *work = fd->sidecar_files;
+               g_string_append(message, _("with sidecar files:\n"));
+               
+               while (work)
                        {
-                       gchar *text = g_strdup_printf(_("%s\nUnable to delete file by external command:\n%s"), editor_get_error_str(flags), fd->path);
-                       file_util_warning_dialog(_("File deletion failed"), text, GTK_STOCK_DIALOG_ERROR, NULL);
-                       g_free(text);
-                       file_data_change_info_free(NULL, fd);
+                       FileData *sfd = work->data;
+                       work =work->next;
+                       g_string_append_printf(message, _(" '%s'\n"), sfd->path);
                        }
                }
-       else if (!file_util_unlink(fd))
+       
+       g_string_append(message, _("\nStatus: "));
+       
+       error = ud->with_sidecars ? file_data_sc_verify_ci(fd) : file_data_verify_ci(fd);
+
+       if (error)
                {
-               gchar *text = g_strdup_printf(_("Unable to delete file:\n%s"), fd->path);
-               file_util_warning_dialog(_("File deletion failed"), text, GTK_STOCK_DIALOG_ERROR, NULL);
-               g_free(text);
-               file_data_change_info_free(NULL, fd);
+               gchar *err_msg = file_data_get_error_string(error);
+               g_string_append(message, err_msg);
+               if (stock_id) *stock_id = (error & CHANGE_ERROR_MASK) ? GTK_STOCK_DIALOG_ERROR : GTK_STOCK_DIALOG_WARNING;
                }
        else
                {
-               file_maint_removed(fd, NULL);
+               g_string_append(message, _("no problem detected"));
+               if (stock_id) *stock_id = GTK_STOCK_DIALOG_INFO;
                }
 
-       file_data_unref(fd);
-}
-
-static void file_util_delete_cancel_cb(GenericDialog *gd, gpointer data)
-{
-       FileData *fd = data;
-
-       file_data_unref(fd);
+       return g_string_free(message, FALSE);;
 }
 
-static void file_util_delete_single(FileData *fd, GtkWidget *parent)
+static void file_util_details_dialog(UtilityData *ud, FileData *fd)
 {
-       if (!options->file_ops.confirm_delete)
-               {
-               file_util_delete_ok_cb(NULL, file_data_ref(fd));
-               }
-       else
-               {
-               GenericDialog *gd;
-               GtkWidget *table;
-               gchar *base;
+       GenericDialog *gd;
+       GtkWidget *box;
+       gchar *message;
+       const gchar *stock_id;
        
-               gd = file_util_gen_dlg(_("Delete file"), GQ_WMCLASS, "dlg_confirm", parent, TRUE,
-                                      file_util_delete_cancel_cb, file_data_ref(fd));
-
-               generic_dialog_add_message(gd, NULL, _("Delete file?"), NULL);
+       gd = file_util_gen_dlg(_("File details"), "details", ud->gd->dialog, TRUE, NULL, ud);
+       generic_dialog_add_button(gd, GTK_STOCK_CLOSE, NULL, file_util_details_dialog_ok_cb, TRUE);
+       generic_dialog_add_button(gd, GTK_STOCK_REMOVE, _("Exclude file"), file_util_details_dialog_exclude_cb, FALSE);
 
-               table = pref_table_new(gd->vbox, 2, 2, FALSE, FALSE);
+       g_object_set_data(G_OBJECT(gd->dialog), "file_data", fd);
 
-               pref_table_label(table, 0, 0, _("File name:"), 1.0);
-               pref_table_label(table, 1, 0, fd->name, 0.0);
+       g_signal_connect(G_OBJECT(gd->dialog), "destroy",
+                        G_CALLBACK(file_util_details_dialog_destroy_cb), ud);
 
-               pref_table_label(table, 0, 1, _("Location:"), 1.0);
+       /* in case the ud->gd->dialog is closed during editing */
+       g_signal_connect(G_OBJECT(ud->gd->dialog), "destroy",
+                        G_CALLBACK(file_util_details_dialog_close_cb), gd->dialog);
 
-               base = remove_level_from_path(fd->path);
-               pref_table_label(table, 1, 1, base, 0.0);
-               g_free(base);
 
-               generic_dialog_add_image(gd, NULL, fd, NULL, NULL, NULL, FALSE);
+       message = file_util_details_get_message(ud, fd, &stock_id);
 
-               box_append_safe_delete_status(gd);
+       box = generic_dialog_add_message(gd, stock_id, _("File details"), message);
 
-               generic_dialog_add_button(gd, GTK_STOCK_DELETE, NULL, file_util_delete_ok_cb, TRUE);
+       generic_dialog_add_image(gd, box, fd, NULL, NULL, NULL, FALSE);
 
-               gtk_widget_show(gd->dialog);
-               }
+       gtk_widget_show(gd->dialog);
+       
+       g_free(message);
 }
 
-void file_util_delete(FileData *source_fd, GList *source_list, GtkWidget *parent)
+static void file_util_write_metadata_details_dialog(UtilityData *ud, FileData *fd)
 {
-       if (!source_fd && !source_list) return;
-
-       if (source_fd)
+       GenericDialog *gd;
+       GtkWidget *box;
+       GtkWidget *table;
+       GtkWidget *frame;
+       GtkWidget *label;
+       GList *keys = NULL;
+       GList *work;
+       gchar *message1;
+       gchar *message2;
+       gint i;
+       const gchar *stock_id;
+       
+       if (fd && fd->modified_xmp)
                {
-               file_util_delete_single(source_fd, parent);
+               keys = g_hash_table_get_keys(fd->modified_xmp);
                }
-       else if (!source_list->next)
+       
+       g_assert(keys);
+       
+       
+       gd = file_util_gen_dlg(_("Overview of changed metadata"), "details", ud->gd->dialog, TRUE, NULL, ud);
+       generic_dialog_add_button(gd, GTK_STOCK_CLOSE, NULL, file_util_details_dialog_ok_cb, TRUE);
+       generic_dialog_add_button(gd, GTK_STOCK_REMOVE, _("Exclude file"), file_util_details_dialog_exclude_cb, FALSE);
+       generic_dialog_add_button(gd, GTK_STOCK_REVERT_TO_SAVED, _("Discard changes"), file_util_details_dialog_discard_cb, FALSE);
+
+       g_object_set_data(G_OBJECT(gd->dialog), "file_data", fd);
+
+       g_signal_connect(G_OBJECT(gd->dialog), "destroy",
+                        G_CALLBACK(file_util_details_dialog_destroy_cb), ud);
+
+       /* in case the ud->gd->dialog is closed during editing */
+       g_signal_connect(G_OBJECT(ud->gd->dialog), "destroy",
+                        G_CALLBACK(file_util_details_dialog_close_cb), gd->dialog);
+
+       message1 = file_util_details_get_message(ud, fd, &stock_id);
+
+       if (fd->change && fd->change->dest)
                {
-               file_util_delete_single(source_list->data, parent);
-               filelist_free(source_list);
+               message2 = g_strdup_printf(_("The following metadata tags will be written to\n'%s'."), fd->change->dest);
                }
        else
                {
-               file_util_delete_multiple(source_list, parent);
+               message2 = g_strdup_printf(_("The following metadata tags will be written to the image file itself."));
                }
-}
-
-/*
- *--------------------------------------------------------------------------
- * Rename routines
- *--------------------------------------------------------------------------
- */
 
-/*
- * rename multiple files
- */
+       box = generic_dialog_add_message(gd, stock_id, _("Overview of changed metadata"), message1);
 
-enum {
-       RENAME_COLUMN_FD = 0,
-       RENAME_COLUMN_PATH,
-       RENAME_COLUMN_NAME,
-       RENAME_COLUMN_PREVIEW,
-       RENAME_COLUMN_COUNT
-};
+       box = pref_group_new(box, TRUE, message2, GTK_ORIENTATION_HORIZONTAL);
 
-typedef enum {
-       RENAME_TYPE_MANUAL = 0,
-       RENAME_TYPE_FORMATTED,
-       RENAME_TYPE_AUTO
-} RenameType;
+       frame = pref_frame_new(box, TRUE, NULL, GTK_ORIENTATION_HORIZONTAL, 2);
+       table = pref_table_new(frame, 2, g_list_length(keys), FALSE, TRUE);
 
-typedef struct _RenameDataMult RenameDataMult;
-struct _RenameDataMult
-{
-       FileDialog *fdlg;
-
-       RenameType rename_type;
-
-       GtkWidget *listview;
-       GtkWidget *combo_type;
-
-       GtkWidget *rename_box;
-       GtkWidget *rename_label;
-       GtkWidget *rename_entry;
-
-       GtkWidget *auto_box;
-       GtkWidget *auto_entry_front;
-       GtkWidget *auto_spin_start;
-       GtkWidget *auto_spin_pad;
-       GtkWidget *auto_entry_end;
-
-       GtkWidget *format_box;
-       GtkWidget *format_entry;
-       GtkWidget *format_spin;
-
-       ImageWindow *imd;
-
-       gint update_idle_id;
-};
+       work = keys;
+       i = 0;
+       while (work)
+               {
+               const gchar *key = work->data;
+               gchar *title = exif_get_description_by_key(key);
+               gchar *title_f = g_strdup_printf("%s:", title);
+               gchar *value = metadata_read_string(fd, key, METADATA_FORMATTED);
+               work = work->next;
+               
+               
+               label = gtk_label_new(title_f);
+               gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.0);
+               pref_label_bold(label, TRUE, FALSE);
+               gtk_table_attach(GTK_TABLE(table), label,
+                                0, 1, i, i + 1,
+                                GTK_FILL, GTK_FILL,
+                                2, 2);
+               gtk_widget_show(label);
+
+               label = gtk_label_new(value);
+               
+               gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
+               gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+               gtk_table_attach(GTK_TABLE(table), label,
+                                1, 2, i, i + 1,
+                                GTK_FILL, GTK_FILL,
+                                2, 2);
+               gtk_widget_show(label);
+
+               g_free(title);
+               g_free(title_f);
+               g_free(value);
+               i++;
+               }
+
+       generic_dialog_add_image(gd, box, fd, NULL, NULL, NULL, FALSE);
+
+       gtk_widget_set_size_request(gd->dialog, DIALOG_WIDTH, -1);
+       gtk_widget_show(gd->dialog);
+       
+       g_list_free(keys);
+       g_free(message1);
+       g_free(message2);
+}
 
-static void file_util_rename_multiple(RenameDataMult *rd);
 
-static void file_util_rename_multiple_ok_cb(GenericDialog *gd, gpointer data)
+static void file_util_mark_ungrouped_files(GList *work)
 {
-       RenameDataMult *rd = data;
-       GtkWidget *dialog;
-
-       dialog = GENERIC_DIALOG(rd->fdlg)->dialog;
-       if (!GTK_WIDGET_VISIBLE(dialog)) gtk_widget_show(dialog);
-
-       rd->fdlg->type = TRUE;
-       file_util_rename_multiple(rd);
+       while (work)
+               {
+               FileData *fd = work->data;
+               file_data_set_regroup_when_finished(fd, TRUE);
+               work = work->next;
+               }
 }
 
-static void file_util_rename_multiple_cancel_cb(GenericDialog *gd, gpointer data)
-{
-       RenameDataMult *rd = data;
-       GtkWidget *dialog;
-
-       dialog = GENERIC_DIALOG(rd->fdlg)->dialog;
-       if (!GTK_WIDGET_VISIBLE(dialog)) gtk_widget_show(dialog);
-}
 
-static gint file_util_rename_multiple_find_row(RenameDataMult *rd, FileData *fd, GtkTreeIter *iter)
+static void file_util_delete_full(FileData *source_fd, GList *flist, GtkWidget *parent, UtilityPhase phase)
 {
-       GtkTreeModel *store;
-       gint valid;
-       gint row = 0;
+       UtilityData *ud;
+       GList *ungrouped = NULL;
+       
+       if (source_fd)
+               flist = g_list_append(flist, file_data_ref(source_fd));
 
-       store = gtk_tree_view_get_model(GTK_TREE_VIEW(rd->listview));
-       valid = gtk_tree_model_get_iter_first(store, iter);
-       while (valid)
+       if (!flist) return;
+       
+       flist = file_data_process_groups_in_selection(flist, TRUE, &ungrouped);
+       
+       if (!file_data_sc_add_ci_delete_list(flist))
                {
-               FileData *fd_n;
-               gint ret;
-
-               gtk_tree_model_get(GTK_TREE_MODEL(store), iter, RENAME_COLUMN_FD, &fd_n, -1);
-               ret = (fd_n == fd);
-//             file_data_unref(fd_n);
-               if (ret) return row;
-
-               valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), iter);
-               row++;
+               file_util_warn_op_in_progress(_("File deletion failed"));
+               file_data_disable_grouping_list(ungrouped, FALSE);
+               filelist_free(flist);
+               filelist_free(ungrouped);
+               return;
                }
+       
+       file_util_mark_ungrouped_files(ungrouped);
+       filelist_free(ungrouped);
 
-       return -1;
-}
-
-static void file_util_rename_multiple(RenameDataMult *rd)
-{
-       FileDialog *fdlg;
-
-       fdlg = rd->fdlg;
+       ud = file_util_data_new(UTILITY_TYPE_DELETE);
+       
+       ud->phase = phase;
+       
+       ud->with_sidecars = TRUE;
 
-       if (isfile(fdlg->dest_path) && !fdlg->type)
-               {
-               GenericDialog *gd;
+       ud->dir_fd = NULL;
+       ud->flist = flist;
+       ud->content_list = NULL;
+       ud->parent = parent;
+       
+       ud->details_func = file_util_details_dialog;
 
-               gd = file_util_gen_dlg(_("Overwrite file"), GQ_WMCLASS, "dlg_confirm",
-                                       NULL, TRUE,
-                                       file_util_rename_multiple_cancel_cb, rd);
+       ud->messages.title = _("Delete");
+       ud->messages.question = _("Delete files?");
+       ud->messages.desc_flist = _("This will delete the following files");
+       ud->messages.desc_source_fd = "";
+       ud->messages.fail = _("File deletion failed");
 
-               generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
-                                          _("Overwrite file?"),
-                                          _("Replace existing file by renaming new file."));
-               pref_spacer(gd->vbox, 0);
+       file_util_dialog_run(ud);
+}
 
-               generic_dialog_add_button(gd, GTK_STOCK_OK, _("_Overwrite"), file_util_rename_multiple_ok_cb, TRUE);
-               generic_dialog_add_image(gd, NULL,
-                                        file_data_new_simple(fdlg->dest_path), _("Existing file"),
-                                        fdlg->source_fd, _("New file"), TRUE);
 
-               gtk_widget_hide(GENERIC_DIALOG(fdlg)->dialog);
+static void file_util_write_metadata_full(FileData *source_fd, GList *flist, GtkWidget *parent, UtilityPhase phase, FileUtilDoneFunc done_func, gpointer done_data)
+{
+       UtilityData *ud;
+       
+       if (source_fd)
+               flist = g_list_append(flist, file_data_ref(source_fd));
 
-               gtk_widget_show(gd->dialog);
+       if (!flist) return;
+       
+       if (!file_data_add_ci_write_metadata_list(flist))
+               {
+               file_util_warn_op_in_progress(_("Can't write metadata"));
+               filelist_free(flist);
                return;
                }
-       else
-               {
-               if (!file_data_add_change_info(fdlg->source_fd, FILEDATA_CHANGE_RENAME, fdlg->source_fd->path, fdlg->dest_path) ||
-                   !rename_file_ext(fdlg->source_fd))
-                       {
-                       gchar *text = g_strdup_printf(_("Unable to rename file:\n%s\n to:\n%s"),
-                                                     fdlg->source_fd->name,
-                                                     filename_from_path(fdlg->dest_path));
-                       file_util_warning_dialog(_("Error renaming file"), text, GTK_STOCK_DIALOG_ERROR, NULL);
-                       g_free(text);
-                       }
-               else
-                       {
-                       GtkTreeModel *store;
-                       GtkTreeIter iter;
-                       GtkTreeIter next;
-                       gint row;
 
-                       store = gtk_tree_view_get_model(GTK_TREE_VIEW(rd->listview));
-                       row = file_util_rename_multiple_find_row(rd, rd->fdlg->source_fd, &iter);
+       ud = file_util_data_new(UTILITY_TYPE_WRITE_METADATA);
+       
+       ud->phase = phase;
 
-                       if (row >= 0 &&
-                           (gtk_tree_model_iter_nth_child(store, &next, NULL, row + 1) ||
-                           (row > 0 && gtk_tree_model_iter_nth_child(store, &next, NULL, row - 1)) ) )
-                               {
-                               GtkTreeSelection *selection;
+       ud->with_sidecars = FALSE; /* operate on individual files, not groups */
 
-                               selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(rd->listview));
-                               gtk_tree_selection_select_iter(selection, &next);
-                               gtk_list_store_remove(GTK_LIST_STORE(store), &iter);
-                               }
-                       else
-                               {
-                               DEBUG_1("closed by #%d", row);
+       ud->dir_fd = NULL;
+       ud->flist = flist;
+       ud->content_list = NULL;
+       ud->parent = parent;
+       
+       ud->done_func = done_func;
+       ud->done_data = done_data;
+       
+       ud->details_func = file_util_write_metadata_details_dialog;
+       ud->finalize_func = metadata_write_queue_remove;
+       ud->discard_func = metadata_write_queue_remove;
+       
+       ud->messages.title = _("Write metadata");
+       ud->messages.question = _("Write metadata?");
+       ud->messages.desc_flist = _("This will write the changed metadata into the following files");
+       ud->messages.desc_source_fd = "";
+       ud->messages.fail = _("Metadata writing failed");
 
-                               file_dialog_close(rd->fdlg);
-                               }
-                       }
-               }
+       file_util_dialog_run(ud);
 }
 
-/* format: * = filename without extension, ## = number position, extension is kept */
-static gchar *file_util_rename_multiple_auto_format_name(const gchar *format, const gchar *name, gint n)
+static void file_util_move_full(FileData *source_fd, GList *flist, const gchar *dest_path, GtkWidget *parent, UtilityPhase phase)
 {
-       gchar *new_name;
-       gchar *parsed;
-       const gchar *ext;
-       gchar *middle;
-       gchar *tmp;
-       gchar *pad_start;
-       gchar *pad_end;
-       gint padding;
+       UtilityData *ud;
+       GList *ungrouped = NULL;
+       
+       if (source_fd)
+               flist = g_list_append(flist, file_data_ref(source_fd));
 
-       if (!format || !name) return NULL;
+       if (!flist) return;
 
-       tmp = g_strdup(format);
-       pad_start = strchr(tmp, '#');
-       if (pad_start)
-               {
-               pad_end = pad_start;
-               padding = 0;
-               while (*pad_end == '#')
-                       {
-                       pad_end++;
-                       padding++;
-                       }
-               *pad_start = '\0';
+       flist = file_data_process_groups_in_selection(flist, TRUE, &ungrouped);
 
-               parsed = g_strdup_printf("%s%0*d%s", tmp, padding, n, pad_end);
-               g_free(tmp);
-               }
-       else
+       if (!file_data_sc_add_ci_move_list(flist, dest_path))
                {
-               parsed = tmp;
+               file_util_warn_op_in_progress(_("Move failed"));
+               file_data_disable_grouping_list(ungrouped, FALSE);
+               filelist_free(flist);
+               filelist_free(ungrouped);
+               return;
                }
+       
+       file_util_mark_ungrouped_files(ungrouped);
+       filelist_free(ungrouped);
 
-       ext = extension_from_path(name);
+       ud = file_util_data_new(UTILITY_TYPE_MOVE);
 
-       middle = strchr(parsed, '*');
-       if (middle)
-               {
-               gchar *base;
+       ud->phase = phase;
 
-               *middle = '\0';
-               middle++;
+       ud->with_sidecars = TRUE;
 
-               base = remove_extension_from_path(name);
-               new_name = g_strconcat(parsed, base, middle, ext, NULL);
-               g_free(base);
-               }
-       else
-               {
-               new_name = g_strconcat(parsed, ext, NULL);
-               }
+       ud->dir_fd = NULL;
+       ud->flist = flist;
+       ud->content_list = NULL;
+       ud->parent = parent;
 
-       g_free(parsed);
+       if (dest_path) ud->dest_path = g_strdup(dest_path);
+       
+       ud->messages.title = _("Move");
+       ud->messages.question = _("Move files?");
+       ud->messages.desc_flist = _("This will move the following files");
+       ud->messages.desc_source_fd = "";
+       ud->messages.fail = _("Move failed");
 
-       return new_name;
+       file_util_dialog_run(ud);
 }
 
-static void file_util_rename_multiple_auto(RenameDataMult *rd)
+static void file_util_copy_full(FileData *source_fd, GList *flist, const gchar *dest_path, GtkWidget *parent, UtilityPhase phase)
 {
-       const gchar *front;
-       const gchar *end;
-       const gchar *format;
-       gint start_n;
-       gint padding;
-       gint n;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gint valid;
-       gint success;
-
-       front = gtk_entry_get_text(GTK_ENTRY(rd->auto_entry_front));
-       end = gtk_entry_get_text(GTK_ENTRY(rd->auto_entry_end));
-       padding = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rd->auto_spin_pad));
+       UtilityData *ud;
+       GList *ungrouped = NULL;
+       
+       if (source_fd)
+               flist = g_list_append(flist, file_data_ref(source_fd));
 
-       format = gtk_entry_get_text(GTK_ENTRY(rd->format_entry));
+       if (!flist) return;
 
-       if (rd->rename_type == RENAME_TYPE_FORMATTED)
-               {
-               start_n = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rd->format_spin));
+       if (file_util_write_metadata_first(UTILITY_TYPE_COPY, phase, flist, dest_path, NULL, parent))
+               return;
 
-               if (!format ||
-                   (strchr(format, '*') == NULL && strchr(format, '#') == NULL))
-                       {
-                       file_util_warning_dialog(_("Auto rename"),
-                              _("Format must include at least one of the symbol characters '*' or '#'.\n"),
-                              GTK_STOCK_DIALOG_WARNING, NULL);
-                       return;
-                       }
+       flist = file_data_process_groups_in_selection(flist, TRUE, &ungrouped);
 
-               history_combo_append_history(rd->format_entry, NULL);
-               }
-       else
+       if (!file_data_sc_add_ci_copy_list(flist, dest_path))
                {
-               start_n = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rd->auto_spin_start));
-
-               history_combo_append_history(rd->auto_entry_front, NULL);
-               history_combo_append_history(rd->auto_entry_end, NULL);
+               file_util_warn_op_in_progress(_("Copy failed"));
+               file_data_disable_grouping_list(ungrouped, FALSE);
+               filelist_free(flist);
+               filelist_free(ungrouped);
+               return;
                }
 
-       store = gtk_tree_view_get_model(GTK_TREE_VIEW(rd->listview));
+       file_util_mark_ungrouped_files(ungrouped);
+       filelist_free(ungrouped);
 
-       /* first check for name conflicts */
-       success = TRUE;
-       n = start_n;
-       valid = gtk_tree_model_get_iter_first(store, &iter);
-       while (valid && success)
-               {
-               gchar *dest;
-               gchar *base;
-               FileData *fd;
+       ud = file_util_data_new(UTILITY_TYPE_COPY);
 
-               gtk_tree_model_get(store, &iter, RENAME_COLUMN_FD, &fd, -1);
-               base = remove_level_from_path(fd->path);
+       ud->phase = phase;
 
-               if (rd->rename_type == RENAME_TYPE_FORMATTED)
-                       {
-                       gchar *new_name;
+       ud->with_sidecars = TRUE;
 
-                       new_name = file_util_rename_multiple_auto_format_name(format, fd->name, n);
-                       dest = g_strconcat(base, "/", new_name, NULL);
-                       g_free(new_name);
-                       }
-               else
-                       {
-                       dest = g_strdup_printf("%s/%s%0*d%s", base, front, padding, n, end);
-                       }
+       ud->dir_fd = NULL;
+       ud->flist = flist;
+       ud->content_list = NULL;
+       ud->parent = parent;
 
-               if (isname(dest)) success = FALSE;
+       if (dest_path) ud->dest_path = g_strdup(dest_path);
+       
+       ud->messages.title = _("Copy");
+       ud->messages.question = _("Copy files?");
+       ud->messages.desc_flist = _("This will copy the following files");
+       ud->messages.desc_source_fd = "";
+       ud->messages.fail = _("Copy failed");
 
-               g_free(dest);
-               g_free(base);
-//             file_data_unref(fd);
+       file_util_dialog_run(ud);
+}
 
-               n++;
-               valid = gtk_tree_model_iter_next(store, &iter);
-               }
+static void file_util_rename_full(FileData *source_fd, GList *flist, const gchar *dest_path, GtkWidget *parent, UtilityPhase phase)
+{
+       UtilityData *ud;
+       GList *ungrouped = NULL;
+       
+       if (source_fd)
+               flist = g_list_append(flist, file_data_ref(source_fd));
 
-       if (!success)
+       if (!flist) return;
+
+       flist = file_data_process_groups_in_selection(flist, TRUE, &ungrouped);
+
+       if (!file_data_sc_add_ci_rename_list(flist, dest_path))
                {
-               file_util_warning_dialog(_("Auto rename"),
-                              _("Can not auto rename with the selected\nnumber set, one or more files exist that\nmatch the resulting name list.\n"),
-                              GTK_STOCK_DIALOG_WARNING, NULL);
+               file_util_warn_op_in_progress(_("Rename failed"));
+               file_data_disable_grouping_list(ungrouped, FALSE);
+               filelist_free(flist);
+               filelist_free(ungrouped);
                return;
                }
 
-       /* select the first iter, so that on fail the correct info is given to user */
-       if (gtk_tree_model_get_iter_first(store, &iter))
-               {
-               GtkTreeSelection *selection;
-
-               selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(rd->listview));
-               gtk_tree_selection_select_iter(selection, &iter);
-               }
+       file_util_mark_ungrouped_files(ungrouped);
+       filelist_free(ungrouped);
 
-       /* now do it for real */
-       success = TRUE;
-       n = start_n;
-       while (success && gtk_tree_model_get_iter_first(store, &iter))
-               {
-               gchar *dest;
-               gchar *base;
-               FileData *fd;
+       ud = file_util_data_new(UTILITY_TYPE_RENAME);
 
-               gtk_tree_model_get(store, &iter, RENAME_COLUMN_FD, &fd, -1);
-               base = remove_level_from_path(fd->path);
+       ud->phase = phase;
 
-               if (rd->rename_type == RENAME_TYPE_FORMATTED)
-                       {
-                       gchar *new_name;
+       ud->with_sidecars = TRUE;
 
-                       new_name = file_util_rename_multiple_auto_format_name(format, fd->name, n);
-                       dest = g_strconcat(base, "/", new_name, NULL);
-                       g_free(new_name);
-                       }
-               else
-                       {
-                       dest = g_strdup_printf("%s/%s%0*d%s", base, front, padding, n, end);
-                       }
+       ud->dir_fd = NULL;
+       ud->flist = flist;
+       ud->content_list = NULL;
+       ud->parent = parent;
 
-               if (!file_data_add_change_info(fd, FILEDATA_CHANGE_RENAME, fd->path, dest) ||
-                   !rename_file_ext(fd))
-                       {
-                       success = FALSE;
-                       }
+       ud->details_func = file_util_details_dialog;
+       
+       ud->messages.title = _("Rename");
+       ud->messages.question = _("Rename files?");
+       ud->messages.desc_flist = _("This will rename the following files");
+       ud->messages.desc_source_fd = "";
+       ud->messages.fail = _("Rename failed");
 
-               g_free(dest);
-               g_free(base);
-//             file_data_unref(fd);
+       file_util_dialog_run(ud);
+}
 
-               if (success)
+static void file_util_start_editor_full(const gchar *key, FileData *source_fd, GList *flist, const gchar *dest_path, const gchar *working_directory, GtkWidget *parent, UtilityPhase phase)
+{
+       UtilityData *ud;
+       GList *ungrouped = NULL;
+       
+       if (editor_no_param(key))
+               {
+               gchar *file_directory = NULL;
+               if (!working_directory)
                        {
-                       gtk_list_store_remove(GTK_LIST_STORE(store), &iter);
-                       if (gtk_tree_model_get_iter_first(store, &iter))
-                               {
-                               GtkTreeSelection *selection;
+                       /* working directory was not specified, try to extract it from the files */
+                       if (source_fd)
+                               file_directory = remove_level_from_path(source_fd->path);
 
-                               selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(rd->listview));
-                               gtk_tree_selection_select_iter(selection, &iter);
-                               }
+                       if (!file_directory && flist)
+                               file_directory = remove_level_from_path(((FileData *)flist->data)->path);
+                       working_directory = file_directory;
                        }
-
-               n++;
+               
+               /* just start the editor, don't care about files */
+               start_editor(key, working_directory);
+               g_free(file_directory);
+               filelist_free(flist);
+               return;
                }
-
-       if (!success)
+       
+       
+       if (source_fd)
                {
-               gchar *buf;
-
-               n--;
-               gtk_spin_button_set_value(GTK_SPIN_BUTTON(rd->auto_spin_start), (gdouble)n);
-
-               buf = g_strdup_printf(_("Failed to rename\n%s\nThe number was %d."), rd->fdlg->source_fd->name, n);
-               file_util_warning_dialog(_("Auto rename"), buf, GTK_STOCK_DIALOG_ERROR, NULL);
-               g_free(buf);
-
-               return;
+               /* flist is most probably NULL
+                  operate on source_fd and it's sidecars
+               */
+               flist = g_list_concat(filelist_copy(source_fd->sidecar_files), flist);
+               flist = g_list_append(flist, file_data_ref(source_fd));
                }
 
-       file_dialog_close(rd->fdlg);
-}
+       if (!flist) return;
+       
+       if (file_util_write_metadata_first(UTILITY_TYPE_FILTER, phase, flist, dest_path, key, parent))
+               return;
 
-static void file_util_rename_multiple_cb(FileDialog *fdlg, gpointer data)
-{
-       RenameDataMult *rd = data;
-       gchar *base;
-       const gchar *name;
+       flist = file_data_process_groups_in_selection(flist, TRUE, &ungrouped);
 
-       if (rd->rename_type != RENAME_TYPE_MANUAL)
+       if (!file_data_sc_add_ci_unspecified_list(flist, dest_path))
                {
-               file_util_rename_multiple_auto(rd);
+               file_util_warn_op_in_progress(_("Can't run external editor"));
+               file_data_disable_grouping_list(ungrouped, FALSE);
+               filelist_free(flist);
+               filelist_free(ungrouped);
                return;
                }
 
-       name = gtk_entry_get_text(GTK_ENTRY(rd->rename_entry));
-       base = remove_level_from_path(fdlg->source_fd->path);
+       file_util_mark_ungrouped_files(ungrouped);
+       filelist_free(ungrouped);
 
-       g_free(fdlg->dest_path);
-       fdlg->dest_path = g_build_filename(base, name, NULL);
-       g_free(base);
+       if (editor_is_filter(key))
+               ud = file_util_data_new(UTILITY_TYPE_FILTER);
+       else
+               ud = file_util_data_new(UTILITY_TYPE_EDITOR);
+               
+               
+       /* ask for destination if we don't have it */
+       if (ud->type == UTILITY_TYPE_FILTER && dest_path == NULL) phase = UTILITY_PHASE_START;
+       
+       ud->phase = phase;
 
-       if (strlen(name) == 0 || strcmp(fdlg->source_fd->path, fdlg->dest_path) == 0)
-               {
-               return;
-               }
+       ud->with_sidecars = TRUE;
+       
+       ud->external_command = g_strdup(key);
 
-       fdlg->type = FALSE;
-       file_util_rename_multiple(rd);
-}
+       ud->dir_fd = NULL;
+       ud->flist = flist;
+       ud->content_list = NULL;
+       ud->parent = parent;
 
-static void file_util_rename_multiple_close_cb(FileDialog *fdlg, gpointer data)
-{
-       RenameDataMult *rd = data;
+       ud->details_func = file_util_details_dialog;
 
-       file_dialog_close(rd->fdlg);
+       if (dest_path) ud->dest_path = g_strdup(dest_path);
+       
+       ud->messages.title = _("Editor");
+       ud->messages.question = _("Run editor?");
+       ud->messages.desc_flist = _("This will copy the following files");
+       ud->messages.desc_source_fd = "";
+       ud->messages.fail = _("External command failed");
+
+       file_util_dialog_run(ud);
 }
 
-static gboolean file_util_rename_multiple_select_cb(GtkTreeSelection *selection, GtkTreeModel *store, GtkTreePath *tpath,
-                                                   gboolean path_currently_selected, gpointer data)
+static GList *file_util_delete_dir_remaining_folders(GList *dlist)
 {
-       RenameDataMult *rd = data;
-       GtkTreeIter iter;
-       const gchar *name;
-       FileData *fd = NULL;
-
-       if (path_currently_selected ||
-           !gtk_tree_model_get_iter(store, &iter, tpath)) return TRUE;
-       gtk_tree_model_get(store, &iter, RENAME_COLUMN_FD, &fd, -1);
-
-       file_data_unref(rd->fdlg->source_fd);
-       rd->fdlg->source_fd = file_data_ref(fd);
+       GList *rlist = NULL;
 
-       name = rd->fdlg->source_fd->name;
-       gtk_label_set_text(GTK_LABEL(rd->rename_label), name);
-       gtk_entry_set_text(GTK_ENTRY(rd->rename_entry), name);
+       while (dlist)
+               {
+               FileData *fd;
 
-       image_change_fd(rd->imd, rd->fdlg->source_fd, 0.0);
+               fd = dlist->data;
+               dlist = dlist->next;
 
-       if (GTK_WIDGET_VISIBLE(rd->rename_box))
-               {
-               gtk_widget_grab_focus(rd->rename_entry);
-               gtk_editable_select_region(GTK_EDITABLE(rd->rename_entry), 0, filename_base_length(name));
+               if (!fd->name ||
+                   (strcmp(fd->name, THUMB_FOLDER_GLOBAL) != 0 &&
+                    strcmp(fd->name, THUMB_FOLDER_LOCAL) != 0 &&
+                    strcmp(fd->name, GQ_CACHE_LOCAL_METADATA) != 0) )
+                       {
+                       rlist = g_list_prepend(rlist, fd);
+                       }
                }
 
-       return TRUE;
+       return g_list_reverse(rlist);
 }
 
-static void file_util_rename_multiple_preview_update(RenameDataMult *rd)
+static gboolean file_util_delete_dir_empty_path(UtilityData *ud, FileData *fd, gint level)
 {
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       const gchar *front;
-       const gchar *end;
-       const gchar *format;
-       gint valid;
-       gint start_n;
-       gint padding;
-       gint n;
+       GList *dlist;
+       GList *flist;
+       GList *work;
+       
+       gboolean ok = TRUE;
 
-       front = gtk_entry_get_text(GTK_ENTRY(rd->auto_entry_front));
-       end = gtk_entry_get_text(GTK_ENTRY(rd->auto_entry_end));
-       padding = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rd->auto_spin_pad));
+       DEBUG_1("deltree into: %s", fd->path);
 
-       format = gtk_entry_get_text(GTK_ENTRY(rd->format_entry));
+       level++;
+       if (level > UTILITY_DELETE_MAX_DEPTH)
+               {
+               log_printf("folder recursion depth past %d, giving up\n", UTILITY_DELETE_MAX_DEPTH);
+               // ud->fail_fd = fd
+               return 0;
+               }
 
-       if (rd->rename_type == RENAME_TYPE_FORMATTED)
+       if (!filelist_read_lstat(fd, &flist, &dlist))
                {
-               start_n = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rd->format_spin));
+               // ud->fail_fd = fd
+               return 0;
                }
-       else
+
+       if (ok)
                {
-               start_n = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rd->auto_spin_start));
+               ok = file_data_sc_add_ci_delete(fd);
+               if (ok)
+                       {
+                       ud->content_list = g_list_prepend(ud->content_list, fd);
+                       }
+               // ud->fail_fd = fd
                }
 
-       store = gtk_tree_view_get_model(GTK_TREE_VIEW(rd->listview));
-       n = start_n;
-       valid = gtk_tree_model_get_iter_first(store, &iter);
-       while (valid)
+       work = dlist;
+       while (work && ok)
                {
-               gchar *dest;
+               FileData *lfd;
 
-               if (rd->rename_type == RENAME_TYPE_FORMATTED)
-                       {
-                       FileData *fd;
+               lfd = work->data;
+               work = work->next;
 
-                       gtk_tree_model_get(store, &iter, RENAME_COLUMN_FD, &fd, -1);
-                       dest = file_util_rename_multiple_auto_format_name(format, fd->name, n);
-//                     file_data_unref(fd);
-                       }
-               else
+               ok = file_util_delete_dir_empty_path(ud, lfd, level);
+               }
+
+       work = flist;
+       while (work && ok)
+               {
+               FileData *lfd;
+
+               lfd = work->data;
+               work = work->next;
+
+               DEBUG_1("deltree child: %s", lfd->path);
+
+               ok = file_data_sc_add_ci_delete(lfd);
+               if (ok)
                        {
-                       dest = g_strdup_printf("%s%0*d%s", front, padding, n, end);
+                       ud->content_list = g_list_prepend(ud->content_list, lfd);
                        }
-               gtk_list_store_set(GTK_LIST_STORE(store), &iter, RENAME_COLUMN_PREVIEW, dest, -1);
-               g_free(dest);
-
-               n++;
-               valid = gtk_tree_model_iter_next(store, &iter);
+               // ud->fail_fd = fd
                }
 
-}
+       filelist_free(dlist);
+       filelist_free(flist);
 
-static gboolean file_util_rename_multiple_idle_cb(gpointer data)
-{
-       RenameDataMult *rd = data;
 
-       file_util_rename_multiple_preview_update(rd);
+       DEBUG_1("deltree done: %s", fd->path);
 
-       rd->update_idle_id = -1;
-       return FALSE;
+       return ok;
 }
 
-static void file_util_rename_multiple_preview_order_cb(GtkTreeModel *treemodel, GtkTreePath *tpath,
-                                                      GtkTreeIter *iter, gpointer data)
+static gboolean file_util_delete_dir_prepare(UtilityData *ud, GList *flist, GList *dlist)
 {
-       RenameDataMult *rd = data;
+       gboolean ok = TRUE;
+       GList *work;
 
-       if (rd->rename_type != RENAME_TYPE_MANUAL && rd->update_idle_id == -1)
-               {
-               rd->update_idle_id = g_idle_add(file_util_rename_multiple_idle_cb, rd);
-               }
-}
 
-static void file_util_rename_multiple_preview_entry_cb(GtkWidget *entry, gpointer data)
-{
-       RenameDataMult *rd = data;
-       file_util_rename_multiple_preview_update(rd);
-}
+       work = dlist;
+       while (work && ok)
+               {
+               FileData *fd;
 
-static void file_util_rename_multiple_preview_adj_cb(GtkWidget *spin, gpointer data)
-{
-       RenameDataMult *rd = data;
-       file_util_rename_multiple_preview_update(rd);
-}
+               fd = work->data;
+               work = work->next;
 
-static void file_util_rename_multiple_auto_change(GtkWidget *widget, gpointer data)
-{
-       RenameDataMult *rd = data;
-       GtkTreeViewColumn *column;
+               ok = file_util_delete_dir_empty_path(ud, fd, 0);
+               }
 
-       rd->rename_type = gtk_combo_box_get_active(GTK_COMBO_BOX(rd->combo_type));
+       work = flist;
+       if (ok && file_data_sc_add_ci_delete_list(flist))
+               {
+               ud->content_list = g_list_concat(filelist_copy(flist), ud->content_list);
+               }
+       else
+               {
+               ok = FALSE;
+               }
 
-       switch (rd->rename_type)
+       if (ok)
                {
-               case RENAME_TYPE_FORMATTED:
-                       if (GTK_WIDGET_VISIBLE(rd->rename_box)) gtk_widget_hide(rd->rename_box);
-                       if (GTK_WIDGET_VISIBLE(rd->auto_box)) gtk_widget_hide(rd->auto_box);
-                       if (!GTK_WIDGET_VISIBLE(rd->format_box)) gtk_widget_show(rd->format_box);
-                       file_util_rename_multiple_preview_update(rd);
-                       break;
-               case RENAME_TYPE_AUTO:
-                       if (GTK_WIDGET_VISIBLE(rd->format_box)) gtk_widget_hide(rd->format_box);
-                       if (GTK_WIDGET_VISIBLE(rd->rename_box)) gtk_widget_hide(rd->rename_box);
-                       if (!GTK_WIDGET_VISIBLE(rd->auto_box)) gtk_widget_show(rd->auto_box);
-                       file_util_rename_multiple_preview_update(rd);
-                       break;
-               case RENAME_TYPE_MANUAL:
-               default:
-                       if (GTK_WIDGET_VISIBLE(rd->format_box)) gtk_widget_hide(rd->format_box);
-                       if (GTK_WIDGET_VISIBLE(rd->auto_box)) gtk_widget_hide(rd->auto_box);
-                       if (!GTK_WIDGET_VISIBLE(rd->rename_box)) gtk_widget_show(rd->rename_box);
-                       break;
+               ok = file_data_sc_add_ci_delete(ud->dir_fd);
                }
+       
+       if (!ok)
+               {
+               work = ud->content_list;
+               while (work)
+                       {
+                       FileData *fd;
 
-       column = gtk_tree_view_get_column(GTK_TREE_VIEW(rd->listview), RENAME_COLUMN_PREVIEW - 1);
-       gtk_tree_view_column_set_visible(column, (rd->rename_type != RENAME_TYPE_MANUAL));
+                       fd = work->data;
+                       work = work->next;
+                       file_data_sc_free_ci(fd);
+                       }
+               }
+       
+       return ok;
 }
 
-static GtkWidget *furm_simple_vlabel(GtkWidget *box, const gchar *text, gint expand)
+static void file_util_delete_dir_full(FileData *fd, GtkWidget *parent, UtilityPhase phase)
 {
-       GtkWidget *vbox;
-       GtkWidget *label;
-
-       vbox = gtk_vbox_new(FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(box), vbox, expand, expand, 0);
-       gtk_widget_show(vbox);
+       GList *dlist;
+       GList *flist;
+       GList *rlist;
 
-       label = gtk_label_new(text);
-       gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-       gtk_widget_show(label);
+       if (!isdir(fd->path)) return;
 
-       return vbox;
-}
+       if (islink(fd->path))
+               {
+               UtilityData *ud;
+               ud = file_util_data_new(UTILITY_TYPE_DELETE_LINK);
 
-static GtkTreeViewColumn *file_util_rename_multiple_add_column(RenameDataMult *rd, const gchar *text, gint n)
-{
-       GtkTreeViewColumn *column;
-       GtkCellRenderer *renderer;
+               ud->phase = phase;
+               ud->with_sidecars = TRUE;
+               ud->dir_fd = file_data_ref(fd);
+               ud->content_list = NULL;
+               ud->flist = NULL;
 
-       column = gtk_tree_view_column_new();
-       gtk_tree_view_column_set_title(column, text);
-       gtk_tree_view_column_set_min_width(column, 4);
-       gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
-       renderer = gtk_cell_renderer_text_new();
-       gtk_tree_view_column_pack_start(column, renderer, TRUE);
-       gtk_tree_view_column_add_attribute(column, renderer, "text", n);
-       gtk_tree_view_append_column(GTK_TREE_VIEW(rd->listview), column);
+               ud->parent = parent;
+       
+               ud->messages.title = _("Delete folder");
+               ud->messages.question = _("Delete symbolic link?");
+               ud->messages.desc_flist = "";
+               ud->messages.desc_source_fd = _("This will delete the symbolic link.\n"
+                                               "The folder this link points to will not be deleted.");
+               ud->messages.fail = _("Link deletion failed");
+
+               file_util_dialog_run(ud);
+               return;
+               }
 
-       return column;
-}
+       if (!access_file(fd->path, W_OK | X_OK))
+               {
+               gchar *text;
 
-static void file_util_rename_multiple_destroy_cb(GtkWidget *widget, gpointer data)
-{
-       RenameDataMult *rd = data;
+               text = g_strdup_printf(_("Unable to remove folder %s\n"
+                                        "Permissions do not allow writing to the folder."), fd->path);
+               file_util_warning_dialog(_("Delete failed"), text, GTK_STOCK_DIALOG_ERROR, parent);
+               g_free(text);
 
-       if (rd->update_idle_id != -1) g_source_remove(rd->update_idle_id);
+               return;
+               }
 
-       g_free(rd);
-}
+       if (!filelist_read_lstat(fd, &flist, &dlist))
+               {
+               gchar *text;
 
-static void file_util_rename_multiple_do(GList *source_list, GtkWidget *parent)
-{
-       RenameDataMult *rd;
-       GtkWidget *pane;
-       GtkWidget *scrolled;
-       GtkListStore *store;
-       GtkTreeSelection *selection;
-       GtkTreeViewColumn *column;
-       GtkWidget *hbox;
-       GtkWidget *vbox;
-       GtkWidget *box2;
-       GtkWidget *table;
-       GtkWidget *combo;
-       GList *work;
-       const gchar *name;
+               text = g_strdup_printf(_("Unable to list contents of folder %s"), fd->path);
+               file_util_warning_dialog(_("Delete failed"), text, GTK_STOCK_DIALOG_ERROR, parent);
+               g_free(text);
 
-       rd = g_new0(RenameDataMult, 1);
+               return;
+               }
 
-       rd->fdlg = file_util_file_dlg( _("Rename"), GQ_WMCLASS, "dlg_rename", parent,
-                                     file_util_rename_multiple_close_cb, rd);
-       generic_dialog_add_message(GENERIC_DIALOG(rd->fdlg), NULL, _("Rename multiple files"), NULL);
-       file_dialog_add_button(rd->fdlg, GTK_STOCK_OK, _("_Rename"), file_util_rename_multiple_cb, TRUE);
+       rlist = file_util_delete_dir_remaining_folders(dlist);
+       if (rlist)
+               {
+               GenericDialog *gd;
+               GtkWidget *box;
+               gchar *text;
 
-       rd->fdlg->source_fd = file_data_ref(source_list->data);
-       rd->fdlg->dest_path = NULL;
+               gd = file_util_gen_dlg(_("Folder contains subfolders"), "dlg_warning",
+                                       parent, TRUE, NULL, NULL);
+               generic_dialog_add_button(gd, GTK_STOCK_CLOSE, NULL, NULL, TRUE);
 
-       rd->rename_type = RENAME_TYPE_MANUAL;
+               text = g_strdup_printf(_("Unable to delete the folder:\n\n%s\n\n"
+                                        "This folder contains subfolders which must be moved before it can be deleted."),
+                                       fd->path);
+               box = generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING,
+                                                _("Folder contains subfolders"),
+                                                text);
+               g_free(text);
 
-       rd->update_idle_id = -1;
+               box = pref_group_new(box, TRUE, _("Subfolders:"), GTK_ORIENTATION_VERTICAL);
 
-       vbox = GENERIC_DIALOG(rd->fdlg)->vbox;
+               rlist = filelist_sort_path(rlist);
+               file_util_dialog_add_list(box, rlist, FALSE, FALSE);
 
-       pane = gtk_hpaned_new();
-       gtk_box_pack_start(GTK_BOX(vbox), pane, TRUE, TRUE, 0);
-       gtk_widget_show(pane);
+               gtk_widget_show(gd->dialog);
+               }
+       else
+               {
+               UtilityData *ud;
+               ud = file_util_data_new(UTILITY_TYPE_DELETE_FOLDER);
 
-       scrolled = gtk_scrolled_window_new(NULL, NULL);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
-                                      GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-       gtk_paned_pack1(GTK_PANED(pane), scrolled, TRUE, TRUE);
-       gtk_widget_show(scrolled);
+               ud->phase = phase;
+               ud->with_sidecars = TRUE;
+               ud->dir_fd = file_data_ref(fd);
+               ud->content_list = NULL; /* will be filled by file_util_delete_dir_prepare */
+               ud->flist = flist = filelist_sort_path(flist);
 
-       store = gtk_list_store_new(4, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-       rd->listview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
-       g_object_unref(store);
+               ud->parent = parent;
+       
+               ud->messages.title = _("Delete folder");
+               ud->messages.question = _("Delete folder?");
+               ud->messages.desc_flist = _("The folder contains these files:");
+               ud->messages.desc_source_fd = _("This will delete the folder.\n"
+                                               "The contents of this folder will also be deleted.");
+               ud->messages.fail = _("File deletion failed");
+               
+               if (!file_util_delete_dir_prepare(ud, flist, dlist))
+                       {
+                       gchar *text;
 
-       gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(rd->listview), TRUE);
-       gtk_tree_view_set_enable_search(GTK_TREE_VIEW(rd->listview), FALSE);
+                       text = g_strdup_printf(_("Unable to list contents of folder %s"), fd->path);
+                       file_util_warning_dialog(_("Delete failed"), text, GTK_STOCK_DIALOG_ERROR, parent);
+                       g_free(text);
+                       file_data_unref(ud->dir_fd);
+                       file_util_data_free(ud);
+                       }
+               else
+                       {
+                       filelist_free(dlist);
+                       file_util_dialog_run(ud);
+                       return;
+                       }
+               }
 
-       selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(rd->listview));
-       gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_SINGLE);
-       gtk_tree_selection_set_select_function(selection, file_util_rename_multiple_select_cb, rd, NULL);
+       g_list_free(rlist);
+       filelist_free(dlist);
+       filelist_free(flist);
+}
 
-       file_util_rename_multiple_add_column(rd, _("Original Name"), RENAME_COLUMN_NAME);
-       column = file_util_rename_multiple_add_column(rd, _("Preview"), RENAME_COLUMN_PREVIEW);
-       gtk_tree_view_column_set_visible(column, FALSE);
+static gboolean file_util_rename_dir_scan(UtilityData *ud, FileData *fd)
+{
+       GList *dlist;
+       GList *flist;
+       GList *work;
+       
+       gboolean ok = TRUE;
 
-       gtk_tree_view_set_reorderable(GTK_TREE_VIEW(rd->listview), TRUE);
-       g_signal_connect(G_OBJECT(store), "row_changed",
-                        G_CALLBACK(file_util_rename_multiple_preview_order_cb), rd);
-       gtk_widget_set_size_request(rd->listview, 250, 150);
+       if (!filelist_read_lstat(fd, &flist, &dlist))
+               {
+               // ud->fail_fd = fd
+               return 0;
+               }
 
-       gtk_container_add(GTK_CONTAINER(scrolled), rd->listview);
-       gtk_widget_show(rd->listview);
+       ud->content_list = g_list_concat(flist, ud->content_list);
 
-       work = source_list;
-       while (work)
+       work = dlist;
+       while (work && ok)
                {
-               FileData *fd = work->data;
-               GtkTreeIter iter;
-
-               gtk_list_store_append(store, &iter);
-               gtk_list_store_set(store, &iter, RENAME_COLUMN_FD, fd, RENAME_COLUMN_PATH, fd->path, RENAME_COLUMN_NAME, fd->name, -1);
+               FileData *lfd;
 
+               lfd = work->data;
                work = work->next;
-               }
 
-       filelist_free(source_list);
+               ud->content_list = g_list_prepend(ud->content_list, file_data_ref(lfd));
+               ok = file_util_rename_dir_scan(ud, lfd);
+               }
 
-       rd->imd = image_new(TRUE);
-       g_object_set(G_OBJECT(rd->imd->pr), "zoom_expand", FALSE, NULL);
-       gtk_widget_set_size_request(rd->imd->widget, DIALOG_DEF_IMAGE_DIM_X, DIALOG_DEF_IMAGE_DIM_Y);
-       gtk_paned_pack2(GTK_PANED(pane), rd->imd->widget, FALSE, TRUE);
-       gtk_widget_show(rd->imd->widget);
+       filelist_free(dlist);
 
-       hbox = gtk_hbox_new(FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-       gtk_widget_show(hbox);
+       return ok;
+}
 
-       rd->combo_type = gtk_combo_box_new_text();
+static gboolean file_util_rename_dir_prepare(UtilityData *ud, const gchar *new_path)
+{
+       gboolean ok;
+       GList *work;
+       gint orig_len = strlen(ud->dir_fd->path);
+       
+       ok = file_util_rename_dir_scan(ud, ud->dir_fd);
+       
+       work = ud->content_list;
+       
+       while (ok && work)
+               {
+               gchar *np;
+               FileData *fd;
 
-       gtk_combo_box_append_text(GTK_COMBO_BOX(rd->combo_type), _("Manual rename"));
-       gtk_combo_box_append_text(GTK_COMBO_BOX(rd->combo_type), _("Formatted rename"));
-       gtk_combo_box_append_text(GTK_COMBO_BOX(rd->combo_type), _("Auto rename"));
+               fd = work->data;
+               work = work->next;
+               
+               g_assert(strncmp(fd->path, ud->dir_fd->path, orig_len) == 0);
+               
+               np = g_strconcat(new_path, fd->path + orig_len, NULL);
+               
+               ok = file_data_sc_add_ci_rename(fd, np);
+               
+               DEBUG_1("Dir rename: %s -> %s", fd->path, np);
+               g_free(np);
+               }
+       
+       if (ok)
+               {
+               ok = file_data_sc_add_ci_rename(ud->dir_fd, new_path);
+               }
+       
+       if (!ok)
+               {
+               work = ud->content_list;
+               while (work)
+                       {
+                       FileData *fd;
 
-       gtk_combo_box_set_active(GTK_COMBO_BOX(rd->combo_type), rd->rename_type);
+                       fd = work->data;
+                       work = work->next;
+                       file_data_sc_free_ci(fd);
+                       }
+               }
 
-       g_signal_connect(G_OBJECT(rd->combo_type), "changed",
-                        G_CALLBACK(file_util_rename_multiple_auto_change), rd);
-       gtk_box_pack_end(GTK_BOX(hbox), rd->combo_type, FALSE, FALSE, 0);
-       gtk_widget_show(rd->combo_type);
+       return ok;
+}
+       
 
-       rd->rename_box = pref_box_new(vbox, FALSE, GTK_ORIENTATION_VERTICAL, 0);
-       table = pref_table_new(rd->rename_box, 2, 2, FALSE, FALSE);
+static void file_util_rename_dir_full(FileData *fd, const gchar *new_path, GtkWidget *parent, UtilityPhase phase, FileUtilDoneFunc done_func, gpointer done_data)
+{
+       UtilityData *ud;
 
-       pref_table_label(table, 0, 0, _("Original name:"), 1.0);
-       rd->rename_label = pref_table_label(table, 1, 0, rd->fdlg->source_fd->name, 0.0);
+       ud = file_util_data_new(UTILITY_TYPE_RENAME_FOLDER);
 
-       pref_table_label(table, 0, 1, _("New name:"), 1.0);
+       ud->phase = phase;
+       ud->with_sidecars = TRUE; /* does not matter, the directory should not have sidecars
+                                   and the content must be handled including sidecars */
 
-       rd->rename_entry = gtk_entry_new();
-       gtk_table_attach(GTK_TABLE(table), rd->rename_entry, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-       generic_dialog_attach_default(GENERIC_DIALOG(rd->fdlg), rd->rename_entry);
-       gtk_widget_grab_focus(rd->rename_entry);
+       ud->dir_fd = file_data_ref(fd);
+       ud->flist = NULL;
+       ud->content_list = NULL;
+       ud->parent = parent;
 
-       name = rd->fdlg->source_fd->name;
-       gtk_entry_set_text(GTK_ENTRY(rd->rename_entry), name);
-       gtk_editable_select_region(GTK_EDITABLE(rd->rename_entry), 0, filename_base_length(name));
-       gtk_widget_show(rd->rename_entry);
+       ud->done_func = done_func;
+       ud->done_data = done_data;
+       ud->dest_path = g_strdup(new_path);
+       
+       ud->messages.title = _("Rename");
+       ud->messages.question = _("Rename folder?");
+       ud->messages.desc_flist = _("The folder contains the following files");
+       ud->messages.desc_source_fd = "";
+       ud->messages.fail = _("Rename failed");
 
-       rd->auto_box = gtk_vbox_new(FALSE, PREF_PAD_GAP);
-       gtk_box_pack_start(GTK_BOX(vbox), rd->auto_box, FALSE, FALSE, 0);
-       /* do not show it here */
+       if (!file_util_rename_dir_prepare(ud, new_path))
+               {
+               file_util_warn_op_in_progress(ud->messages.fail);
+               file_util_data_free(ud);
+               return;
+               }
 
-       hbox = pref_box_new(rd->auto_box, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
+//     ud->flist = filelist_recursive(fd);
 
-       box2 = furm_simple_vlabel(hbox, _("Begin text"), TRUE);
+       file_util_dialog_run(ud);
+}
 
-       combo = history_combo_new(&rd->auto_entry_front, "", "numerical_rename_prefix", -1);
-       g_signal_connect(G_OBJECT(rd->auto_entry_front), "changed",
-                        G_CALLBACK(file_util_rename_multiple_preview_entry_cb), rd);
-       gtk_box_pack_start(GTK_BOX(box2), combo, TRUE, TRUE, 0);
-       gtk_widget_show(combo);
+static void file_util_create_dir_full(FileData *fd, const gchar *dest_path, GtkWidget *parent, UtilityPhase phase, FileUtilDoneFunc done_func, gpointer done_data)
+{
+       UtilityData *ud;
 
-       box2 = furm_simple_vlabel(hbox, _("Start #"), FALSE);
+       ud = file_util_data_new(UTILITY_TYPE_CREATE_FOLDER);
 
-       rd->auto_spin_start = pref_spin_new(box2, NULL, NULL,
-                                           0.0, 1000000.0, 1.0, 0, 1.0,
-                                           G_CALLBACK(file_util_rename_multiple_preview_adj_cb), rd);
+       ud->phase = phase;
+       ud->with_sidecars = TRUE;
 
-       box2 = furm_simple_vlabel(hbox, _("End text"), TRUE);
+       ud->dir_fd = NULL;
+       ud->flist = NULL;
+       ud->content_list = NULL;
+       ud->parent = parent;
 
-       combo = history_combo_new(&rd->auto_entry_end, "", "numerical_rename_suffix", -1);
-       g_signal_connect(G_OBJECT(rd->auto_entry_end), "changed",
-                        G_CALLBACK(file_util_rename_multiple_preview_entry_cb), rd);
-       gtk_box_pack_start(GTK_BOX(box2), combo, TRUE, TRUE, 0);
-       gtk_widget_show(combo);
-
-       rd->auto_spin_pad = pref_spin_new(rd->auto_box, _("Padding:"), NULL,
-                                         1.0, 8.0, 1.0, 0, 1.0,
-                                         G_CALLBACK(file_util_rename_multiple_preview_adj_cb), rd);
-
-       rd->format_box = gtk_vbox_new(FALSE, PREF_PAD_GAP);
-       gtk_box_pack_start(GTK_BOX(vbox), rd->format_box, FALSE, FALSE, 0);
-       /* do not show it here */
-
-       hbox = pref_box_new(rd->format_box, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
-
-       box2 = furm_simple_vlabel(hbox, _("Format (* = original name, ## = numbers)"), TRUE);
-
-       combo = history_combo_new(&rd->format_entry, "", "auto_rename_format", -1);
-       g_signal_connect(G_OBJECT(rd->format_entry), "changed",
-                        G_CALLBACK(file_util_rename_multiple_preview_entry_cb), rd);
-       gtk_box_pack_start(GTK_BOX(box2), combo, TRUE, TRUE, 0);
-       gtk_widget_show(combo);
-
-       box2 = furm_simple_vlabel(hbox, _("Start #"), FALSE);
-
-       rd->format_spin = pref_spin_new(box2, NULL, NULL,
-                                       0.0, 1000000.0, 1.0, 0, 1.0,
-                                       G_CALLBACK(file_util_rename_multiple_preview_adj_cb), rd);
-
-       image_change_fd(rd->imd, rd->fdlg->source_fd, 0.0);
-
-       g_signal_connect(G_OBJECT(GENERIC_DIALOG(rd->fdlg)->dialog), "destroy",
-                        G_CALLBACK(file_util_rename_multiple_destroy_cb), rd);
-
-       gtk_widget_show(GENERIC_DIALOG(rd->fdlg)->dialog);
-}
-
-/*
- * rename single file
- */
-
-static void file_util_rename_single(FileDataSingle *fds);
-
-static void file_util_rename_single_ok_cb(GenericDialog *gd, gpointer data)
-{
-       FileDataSingle *fds = data;
-       fds->confirmed = TRUE;
-       file_util_rename_single(fds);
-}
-
-static void file_util_rename_single_cancel_cb(GenericDialog *gd, gpointer data)
-{
-       FileDataSingle *fds = data;
-       file_data_single_free(fds);
-}
-
-static void file_util_rename_single(FileDataSingle *fds)
-{
-       if (isfile(fds->dest) && !fds->confirmed)
+       if (dest_path)
                {
-               GenericDialog *gd;
-
-               gd = file_util_gen_dlg(_("Overwrite file"), GQ_WMCLASS, "dlg_confirm",
-                                       NULL, TRUE,
-                                       file_util_rename_single_cancel_cb, fds);
-
-               generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
-                                          _("Overwrite file?"),
-                                          _("Replace existing file by renaming new file."));
-               pref_spacer(gd->vbox, 0);
-
-               generic_dialog_add_button(gd, GTK_STOCK_OK, _("_Overwrite"), file_util_rename_single_ok_cb, TRUE);
-               generic_dialog_add_image(gd, NULL,
-                                        file_data_new_simple(fds->dest), _("Existing file"),
-                                        fds->source_fd, _("New file"), TRUE);
-
-               gtk_widget_show(gd->dialog);
-
-               return;
+               ud->dest_path = g_strdup(dest_path);
                }
        else
                {
-/*
-               GList *list = g_list_append(NULL, file_data_ref(fds->source_fd));
-               file_util_do_move_list(list, FALSE, TRUE);
-               filelist_free(list);
-*/
-               if (!file_data_add_change_info(fds->source_fd, FILEDATA_CHANGE_RENAME, fds->source_fd->path, fds->dest) ||
-                   !rename_file_ext(fds->source_fd))
-                       {
-                       gchar *text = g_strdup_printf(_("Unable to rename file:\n%s\nto:\n%s"), fds->source_fd->name, filename_from_path(fds->dest));
-                       file_util_warning_dialog(_("Error renaming file"), text, GTK_STOCK_DIALOG_ERROR, NULL);
-                       g_free(text);
-                       }
-
-               }
-       file_data_single_free(fds);
-}
-
-static void file_util_rename_single_cb(FileDialog *fdlg, gpointer data)
-{
-       const gchar *name;
-       gchar *path;
-
-       name = gtk_entry_get_text(GTK_ENTRY(fdlg->entry));
-       path = g_build_filename(fdlg->dest_path, name, NULL);
-
-       if (strlen(name) == 0 || strcmp(fdlg->source_fd->path, path) == 0)
-               {
-               g_free(path);
-               return;
+               gchar *buf = g_build_filename(fd->path, _("New folder"), NULL);
+               ud->dest_path = unique_filename(buf, NULL, " ", FALSE);
+               g_free(buf);
                }
+       
+       ud->dir_fd = file_data_new_dir(ud->dest_path);
 
-       file_util_rename_single(file_data_single_new(fdlg->source_fd, path, fdlg->type));
+       ud->done_func = done_func;
+       ud->done_data = done_data;
+       
+       ud->messages.title = _("Create Folder");
+       ud->messages.question = _("Create folder?");
+       ud->messages.desc_flist = "";
+       ud->messages.desc_source_fd = "";
+       ud->messages.fail = _("Can't create folder");
 
-       g_free(path);
-       file_dialog_close(fdlg);
+       file_util_dialog_run(ud);
 }
 
-static void file_util_rename_single_close_cb(FileDialog *fdlg, gpointer data)
-{
-       file_dialog_close(fdlg);
-}
 
-static void file_util_rename_single_do(FileData *source_fd, GtkWidget *parent)
+static gboolean file_util_write_metadata_first_after_done(gpointer data)
 {
-       FileDialog *fdlg;
-       GtkWidget *table;
-       const gchar *name;
-
-       fdlg = file_util_file_dlg(_("Rename"), GQ_WMCLASS, "dlg_rename", parent,
-                                 file_util_rename_single_close_cb, NULL);
-
-       generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, _("Rename file"), NULL);
-       generic_dialog_add_image(GENERIC_DIALOG(fdlg), NULL, source_fd, NULL, NULL, NULL, FALSE);
-
-       file_dialog_add_button(fdlg, GTK_STOCK_OK, _("_Rename"), file_util_rename_single_cb, TRUE);
-
-       fdlg->source_fd = file_data_ref(source_fd);
-       fdlg->dest_path = remove_level_from_path(source_fd->path);
-
-       table = pref_table_new(GENERIC_DIALOG(fdlg)->vbox, 2, 2, FALSE, FALSE);
-
-       pref_table_label(table, 0, 0, _("Original name:"), 1.0);
-       pref_table_label(table, 1, 0, fdlg->source_fd->name, 0.0);
-
-       pref_table_label(table, 0, 1, _("New name:"), 1.0);
-
-       fdlg->entry = gtk_entry_new();
-       gtk_table_attach(GTK_TABLE(table), fdlg->entry, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-       generic_dialog_attach_default(GENERIC_DIALOG(fdlg), fdlg->entry);
-       gtk_widget_grab_focus(fdlg->entry);
-
-       name = fdlg->source_fd->name;
-       gtk_entry_set_text(GTK_ENTRY(fdlg->entry), name);
-       gtk_editable_select_region(GTK_EDITABLE(fdlg->entry), 0, filename_base_length(name));
-       gtk_widget_show(fdlg->entry);
-
-       gtk_widget_show(GENERIC_DIALOG(fdlg)->dialog);
+       UtilityDelayData *dd = data;
+       
+       /* start the delayed operation with original arguments */
+       switch (dd->type)
+               {
+               case UTILITY_TYPE_FILTER:
+               case UTILITY_TYPE_EDITOR:
+                       file_util_start_editor_full(dd->editor_key, NULL, dd->flist, dd->dest_path, NULL, dd->parent, dd->phase);
+                       break;
+               case UTILITY_TYPE_COPY:
+                       file_util_copy_full(NULL, dd->flist, dd->dest_path, dd->parent, dd->phase);
+                       break;
+               default:
+                       g_warning("unsupported type");
+               }
+       g_free(dd->dest_path);
+       g_free(dd->editor_key);
+       g_free(dd);
+       return FALSE;
 }
 
-void file_util_rename(FileData *source_fd, GList *source_list, GtkWidget *parent)
+static void file_util_write_metadata_first_done(gboolean success, const gchar *done_path, gpointer data)
 {
-       if (!source_fd && !source_list) return;
+       UtilityDelayData *dd = data;
 
-       if (source_fd)
-               {
-               file_util_rename_single_do(source_fd, parent);
-               }
-       else if (!source_list->next)
+       if (success)
                {
-               file_util_rename_single_do(source_list->data, parent);
-               filelist_free(source_list);
-               }
-       else
-               {
-               file_util_rename_multiple_do(source_list, parent);
+               dd->idle_id = g_idle_add(file_util_write_metadata_first_after_done, dd);
+               return;
                }
+       
+       /* the operation was cancelled */
+       filelist_free(dd->flist);
+       g_free(dd->dest_path);
+       g_free(dd->editor_key);
+       g_free(dd);
 }
 
-/*
- *--------------------------------------------------------------------------
- * Create directory routines
- *--------------------------------------------------------------------------
- */
-
-static void file_util_create_dir_do(const gchar *base, const gchar *name)
+static gboolean file_util_write_metadata_first(UtilityType type, UtilityPhase phase, GList *flist, const gchar *dest_path, const gchar *editor_key, GtkWidget *parent)
 {
-       gchar *path;
-
-       path = g_build_filename(base, name, NULL);
-
-       if (isdir(path))
-               {
-               gchar *text = g_strdup_printf(_("The folder:\n%s\nalready exists."), name);
-               file_util_warning_dialog(_("Folder exists"), text, GTK_STOCK_DIALOG_INFO, NULL);
-               g_free(text);
-               }
-       else if (isname(path))
-               {
-               gchar *text = g_strdup_printf(_("The path:\n%s\nalready exists as a file."), name);
-               file_util_warning_dialog(_("Could not create folder"), text, GTK_STOCK_DIALOG_INFO, NULL);
-               g_free(text);
-               }
-       else
+       GList *unsaved = NULL;
+       UtilityDelayData *dd;
+       
+       GList *work;
+       
+       work = flist;
+       while (work)
                {
-               if (!mkdir_utf8(path, 0755))
+               FileData *fd = work->data;
+               work = work->next;
+               
+               if (fd->change)
                        {
-                       gchar *text = g_strdup_printf(_("Unable to create folder:\n%s"), name);
-                       file_util_warning_dialog(_("Error creating folder"), text, GTK_STOCK_DIALOG_ERROR, NULL);
-                       g_free(text);
+                       filelist_free(unsaved);
+                       return FALSE; /* another op. in progress, let the caller handle it */
+                       }
+               
+               if (fd->modified_xmp) /* has unsaved metadata */
+                       {
+                       unsaved = g_list_prepend(unsaved, file_data_ref(fd));
                        }
                }
-
-       g_free(path);
+       
+       if (!unsaved) return FALSE;
+       
+       /* save arguments of the original operation */
+       
+       dd = g_new0(UtilityDelayData, 1);
+       
+       dd->type = type;
+       dd->phase = phase;
+       dd->flist = flist;
+       dd->dest_path = g_strdup(dest_path);
+       dd->editor_key = g_strdup(editor_key);
+       dd->parent = parent;
+       
+       file_util_write_metadata(NULL, unsaved, parent, FALSE, file_util_write_metadata_first_done, dd);
+       return TRUE;
 }
 
-static void file_util_create_dir_cb(FileDialog *fdlg, gpointer data)
-{
-       const gchar *name;
-
-       name = gtk_entry_get_text(GTK_ENTRY(fdlg->entry));
-
-       if (strlen(name) == 0) return;
 
-       if (name[0] == '/')
-               {
-               gchar *buf;
-               buf  = remove_level_from_path(name);
-               file_util_create_dir_do(buf, filename_from_path(name));
-               g_free(buf);
-               }
-       else
-               {
-               file_util_create_dir_do(fdlg->dest_path, name);
-               }
+/* full-featured entry points
+*/
 
-       file_dialog_close(fdlg);
+void file_util_delete(FileData *source_fd, GList *source_list, GtkWidget *parent)
+{
+       file_util_delete_full(source_fd, source_list, parent, options->file_ops.confirm_delete ? UTILITY_PHASE_START : UTILITY_PHASE_ENTERING);
 }
 
-static void file_util_create_dir_close_cb(FileDialog *fdlg, gpointer data)
+void file_util_write_metadata(FileData *source_fd, GList *source_list, GtkWidget *parent, gboolean force_dialog, FileUtilDoneFunc done_func, gpointer done_data)
 {
-       file_dialog_close(fdlg);
+       file_util_write_metadata_full(source_fd, source_list, parent,
+                                     ((options->metadata.save_in_image_file && options->metadata.confirm_write) || force_dialog) ? UTILITY_PHASE_START : UTILITY_PHASE_ENTERING,
+                                     done_func, done_data);
 }
 
-void file_util_create_dir(const gchar *path, GtkWidget *parent)
+void file_util_copy(FileData *source_fd, GList *source_list, const gchar *dest_path, GtkWidget *parent)
 {
-       FileDialog *fdlg;
-       gchar *text;
-
-       if (!isdir(path)) return;
-
-       fdlg = file_util_file_dlg(_("New folder"), GQ_WMCLASS, "dlg_newdir", parent,
-                                 file_util_create_dir_close_cb, NULL);
-
-       text = g_strdup_printf(_("Create folder in:\n%s\nnamed:"), path);
-       generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, NULL, text);
-       g_free(text);
-
-       file_dialog_add_button(fdlg, GTK_STOCK_OK, NULL, file_util_create_dir_cb, TRUE);
-
-       fdlg->dest_path = g_strdup(path);
-
-       fdlg->entry = gtk_entry_new();
-       gtk_box_pack_start(GTK_BOX(GENERIC_DIALOG(fdlg)->vbox), fdlg->entry, FALSE, FALSE, 0);
-       generic_dialog_attach_default(GENERIC_DIALOG(fdlg), fdlg->entry);
-       gtk_widget_grab_focus(fdlg->entry);
-       gtk_widget_show(fdlg->entry);
-
-       gtk_widget_show(GENERIC_DIALOG(fdlg)->dialog);
+       file_util_copy_full(source_fd, source_list, dest_path, parent, UTILITY_PHASE_START);
 }
 
-gint file_util_rename_dir(FileData *old_fd, const gchar *new_path, GtkWidget *parent)
+void file_util_move(FileData *source_fd, GList *source_list, const gchar *dest_path, GtkWidget *parent)
 {
-       const gchar *old_name;
-       const gchar *new_name;
-
-       if (!old_fd || !new_path || !isdir(old_fd->path)) return FALSE;
-
-       old_name = old_fd->name;
-       new_name = filename_from_path(new_path);
-
-       if (isdir(new_path))
-               {
-               gchar *text = g_strdup_printf(_("The folder:\n%s\nalready exists."), new_name);
-               file_util_warning_dialog(_("Folder exists"), text, GTK_STOCK_DIALOG_INFO, parent);
-               g_free(text);
-
-               return FALSE;
-               }
-
-       if (isname(new_path))
-               {
-               gchar *text = g_strdup_printf(_("The path:\n%s\nalready exists as a file."), new_name);
-               file_util_warning_dialog(_("Rename failed"), text, GTK_STOCK_DIALOG_INFO,parent);
-               g_free(text);
-
-               return FALSE;
-               }
-       if (!file_data_add_change_info(old_fd, FILEDATA_CHANGE_RENAME, old_fd->path, new_path) ||
-           !rename_file_ext(old_fd))
-               {
-               gchar *text = g_strdup_printf(_("Failed to rename %s to %s."), old_name, new_name);
-               file_util_warning_dialog(_("Rename failed"), text, GTK_STOCK_DIALOG_ERROR, parent);
-               g_free(text);
-
-               return FALSE;
-               }
-
-       return TRUE;
+       file_util_move_full(source_fd, source_list, dest_path, parent, UTILITY_PHASE_START);
 }
 
-/*
- *--------------------------------------------------------------------------
- * Delete directory routines
- *--------------------------------------------------------------------------
- */
+void file_util_rename(FileData *source_fd, GList *source_list, GtkWidget *parent)
+{
+       file_util_rename_full(source_fd, source_list, NULL, parent, UTILITY_PHASE_START);
+}
 
-/* The plan is to eventually make all of utilops.c
- * use UtilityData and UtilityType.
- * And clean up the above mess someday.
+/* these avoid the location entry dialog unless there is an error, list must be files only and
+ * dest_path must be a valid directory path
  */
-
-typedef enum {
-       UTILITY_TYPE_NONE = 0,
-       UTILITY_TYPE_COPY,
-       UTILITY_TYPE_MOVE,
-       UTILITY_TYPE_RENAME,
-       UTILITY_TYPE_DELETE,
-       UTILITY_TYPE_DELETE_LINK,
-       UTILITY_TYPE_DELETE_FOLDER
-} UtilityType;
-
-typedef struct _UtilityData UtilityData;
-struct _UtilityData {
-       UtilityType type;
-       FileData *source_fd;
-       GList *dlist;
-       GList *flist;
-
-       GenericDialog *gd;
-};
-
-enum {
-       UTILITY_COLUMN_FD = 0,
-       UTILITY_COLUMN_PATH,
-       UTILITY_COLUMN_NAME,
-       UTILITY_COLUMN_COUNT
-};
-
-
-#define UTILITY_LIST_MIN_WIDTH  250
-#define UTILITY_LIST_MIN_HEIGHT 150
-
-/* thumbnail spec has a max depth of 4 (.thumb??/fail/appname/??.png) */
-#define UTILITY_DELETE_MAX_DEPTH 5
-
-
-static void file_util_data_free(UtilityData *ud)
+void file_util_move_simple(GList *list, const gchar *dest_path, GtkWidget *parent)
 {
-       if (!ud) return;
-
-       file_data_unref(ud->source_fd);
-       filelist_free(ud->dlist);
-       filelist_free(ud->flist);
-
-       if (ud->gd) generic_dialog_close(ud->gd);
-
-       g_free(ud);
+       file_util_move_full(NULL, list, dest_path, parent, UTILITY_PHASE_ENTERING);
 }
 
-static GtkTreeViewColumn *file_util_dialog_add_list_column(GtkWidget *view, const gchar *text, gint n)
+void file_util_copy_simple(GList *list, const gchar *dest_path, GtkWidget *parent)
 {
-       GtkTreeViewColumn *column;
-       GtkCellRenderer *renderer;
-
-       column = gtk_tree_view_column_new();
-       gtk_tree_view_column_set_title(column, text);
-       gtk_tree_view_column_set_min_width(column, 4);
-       gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
-       renderer = gtk_cell_renderer_text_new();
-       gtk_tree_view_column_pack_start(column, renderer, TRUE);
-       gtk_tree_view_column_add_attribute(column, renderer, "text", n);
-       gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
-
-       return column;
+       file_util_copy_full(NULL, list, dest_path, parent, UTILITY_PHASE_ENTERING);
 }
 
-static GtkWidget *file_util_dialog_add_list(GtkWidget *box, GList *list, gint full_paths)
+void file_util_rename_simple(FileData *fd, const gchar *dest_path, GtkWidget *parent)
 {
-       GtkWidget *scrolled;
-       GtkWidget *view;
-       GtkListStore *store;
-
-       scrolled = gtk_scrolled_window_new(NULL, NULL);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
-                                      GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-       gtk_box_pack_start(GTK_BOX(box), scrolled, TRUE, TRUE, 0);
-       gtk_widget_show(scrolled);
-
-       store = gtk_list_store_new(UTILITY_COLUMN_COUNT, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING);
-       view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
-       g_object_unref(store);
-
-       gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), TRUE);
-       gtk_tree_view_set_enable_search(GTK_TREE_VIEW(view), FALSE);
-
-       if (full_paths)
-               {
-               file_util_dialog_add_list_column(view, _("Location"), UTILITY_COLUMN_PATH);
-               }
-       else
-               {
-               file_util_dialog_add_list_column(view, _("Name"), UTILITY_COLUMN_NAME);
-               }
-
-       gtk_widget_set_size_request(view, UTILITY_LIST_MIN_WIDTH, UTILITY_LIST_MIN_HEIGHT);
-       gtk_container_add(GTK_CONTAINER(scrolled), view);
-       gtk_widget_show(view);
-
-       while (list)
-               {
-               FileData *fd = list->data;
-               GtkTreeIter iter;
-
-               gtk_list_store_append(store, &iter);
-               gtk_list_store_set(store, &iter, UTILITY_COLUMN_FD, fd,
-                                                UTILITY_COLUMN_PATH, fd->path,
-                                                UTILITY_COLUMN_NAME, fd->name, -1);
+       file_util_rename_full(fd, NULL, dest_path, parent, UTILITY_PHASE_ENTERING);
+}
 
-               list = list->next;
-               }
 
-       return view;
+void file_util_start_editor_from_file(const gchar *key, FileData *fd, GtkWidget *parent)
+{
+       file_util_start_editor_full(key, fd, NULL, NULL, NULL, parent, UTILITY_PHASE_ENTERING);
 }
 
-static gboolean file_util_delete_dir_preview_cb(GtkTreeSelection *selection, GtkTreeModel *store,
-                                               GtkTreePath *tpath, gboolean path_currently_selected,
-                                               gpointer data)
+void file_util_start_editor_from_filelist(const gchar *key, GList *list, const gchar *working_directory, GtkWidget *parent)
 {
-       UtilityData *ud = data;
-       GtkTreeIter iter;
-       FileData *fd = NULL;
-
-       if (path_currently_selected ||
-           !gtk_tree_model_get_iter(store, &iter, tpath)) return TRUE;
-
-       gtk_tree_model_get(store, &iter, UTILITY_COLUMN_FD, &fd, -1);
-       generic_dialog_image_set(ud->gd, fd);
-//     file_data_unref(fd);
-
-       return TRUE;
+       file_util_start_editor_full(key, NULL, list, NULL, working_directory, parent, UTILITY_PHASE_ENTERING);
 }
 
-static void file_util_delete_dir_cancel_cb(GenericDialog *gd, gpointer data)
+void file_util_start_filter_from_file(const gchar *key, FileData *fd, const gchar *dest_path, GtkWidget *parent)
 {
-       UtilityData *ud = data;
-
-       ud->gd = NULL;
-       file_util_data_free(ud);
+       file_util_start_editor_full(key, fd, NULL, dest_path, NULL, parent, UTILITY_PHASE_ENTERING);
 }
 
-FileData *file_util_delete_dir_empty_path(FileData *fd, gint real_content, gint level)
+void file_util_start_filter_from_filelist(const gchar *key, GList *list, const gchar *dest_path, GtkWidget *parent)
 {
-       GList *dlist = NULL;
-       GList *flist = NULL;
-       GList *work;
-       FileData *fail = NULL;
-
-       DEBUG_1("deltree into: %s", fd->path);
-
-       level++;
-       if (level > UTILITY_DELETE_MAX_DEPTH)
-               {
-               log_printf("folder recursion depth past %d, giving up\n", UTILITY_DELETE_MAX_DEPTH);
-               return file_data_ref(fd);
-               }
-
-       if (!filelist_read_lstat(fd->path, &flist, &dlist)) file_data_ref(fd);
-
-       work = dlist;
-       while (work && !fail)
-               {
-               FileData *lfd;
-
-               lfd = work->data;
-               work = work->next;
-
-               fail = file_util_delete_dir_empty_path(lfd, real_content, level);
-               }
-
-       work = flist;
-       while (work && !fail)
-               {
-               FileData *lfd;
-
-               lfd = work->data;
-               work = work->next;
-
-               DEBUG_1("deltree child: %s", lfd->path);
-
-               if (real_content && !islink(lfd->path))
-                       {
-                       if (!file_util_unlink(lfd)) fail = file_data_ref(lfd);
-                       }
-               else
-                       {
-                       if (!unlink_file(lfd->path)) fail = file_data_ref(lfd);
-                       }
-               }
-
-       filelist_free(dlist);
-       filelist_free(flist);
-
-       if (!fail && !rmdir_utf8(fd->path))
-               {
-               fail = file_data_ref(fd);
-               }
-
-       DEBUG_1("deltree done: %s", fd->path);
-
-       return fail;
+       file_util_start_editor_full(key, NULL, list, dest_path, NULL, parent, UTILITY_PHASE_ENTERING);
 }
 
-static void file_util_delete_dir_ok_cb(GenericDialog *gd, gpointer data)
+void file_util_delete_dir(FileData *fd, GtkWidget *parent)
 {
-       UtilityData *ud = data;
-
-       ud->gd = NULL;
-
-       if (ud->type == UTILITY_TYPE_DELETE_LINK)
-               {
-               if (!unlink_file(ud->source_fd->path))
-                       {
-                       gchar *text;
-
-                       text = g_strdup_printf("Unable to remove symbolic link:\n %s", ud->source_fd->path);
-                       file_util_warning_dialog(_("Delete failed"), text,
-                                                GTK_STOCK_DIALOG_ERROR, NULL);
-                       g_free(text);
-                       }
-               }
-       else
-               {
-               FileData *fail = NULL;
-               GList *work;
-
-               work = ud->dlist;
-               while (work && !fail)
-                       {
-                       FileData *fd;
-
-                       fd = work->data;
-                       work = work->next;
-
-                       fail = file_util_delete_dir_empty_path(fd, FALSE, 0);
-                       }
-
-               work = ud->flist;
-               while (work && !fail)
-                       {
-                       FileData *fd;
-
-                       fd = work->data;
-                       work = work->next;
-
-                       DEBUG_1("deltree unlink: %s", fd->path);
-
-                       if (islink(fd->path))
-                               {
-                               if (!unlink_file(fd->path)) fail = file_data_ref(fd);
-                               }
-                       else
-                               {
-                               if (!file_util_unlink(fd)) fail = file_data_ref(fd);
-                               }
-                       }
-
-               if (!fail)
-                       {
-                       if (!rmdir_utf8(ud->source_fd->path)) fail = file_data_ref(ud->source_fd);
-                       }
-
-               if (fail)
-                       {
-                       gchar *text;
-
-                       text = g_strdup_printf(_("Unable to delete folder:\n\n%s"), ud->source_fd->path);
-                       gd = file_util_warning_dialog(_("Delete failed"), text, GTK_STOCK_DIALOG_ERROR, NULL);
-                       g_free(text);
-
-                       if (fail != ud->source_fd)
-                               {
-                               pref_spacer(gd->vbox, PREF_PAD_GROUP);
-                               text = g_strdup_printf(_("Removal of folder contents failed at this file:\n\n%s"),
-                                                       fail->path);
-                               pref_label_new(gd->vbox, text);
-                               g_free(text);
-                               }
-
-                       file_data_unref(fail);
-                       }
-               }
-
-       file_util_data_free(ud);
+       file_util_delete_dir_full(fd, parent, UTILITY_PHASE_START);
 }
 
-static GList *file_util_delete_dir_remaining_folders(GList *dlist)
+void file_util_create_dir(FileData *dir_fd, GtkWidget *parent, FileUtilDoneFunc done_func, gpointer done_data)
 {
-       GList *rlist = NULL;
-
-       while (dlist)
-               {
-               FileData *fd;
-
-               fd = dlist->data;
-               dlist = dlist->next;
-
-               if (!fd->name ||
-                   (strcmp(fd->name, THUMB_FOLDER_GLOBAL) != 0 &&
-                    strcmp(fd->name, THUMB_FOLDER_LOCAL) != 0 &&
-                    strcmp(fd->name, GQ_CACHE_LOCAL_METADATA) != 0) )
-                       {
-                       rlist = g_list_prepend(rlist, fd);
-                       }
-               }
-
-       return g_list_reverse(rlist);
+       file_util_create_dir_full(dir_fd, NULL, parent, UTILITY_PHASE_ENTERING, done_func, done_data);
 }
 
-void file_util_delete_dir(FileData *fd, GtkWidget *parent)
+void file_util_rename_dir(FileData *source_fd, const gchar *new_path, GtkWidget *parent, FileUtilDoneFunc done_func, gpointer done_data)
 {
-       GList *dlist = NULL;
-       GList *flist = NULL;
-       GList *rlist;
-
-       if (!isdir(fd->path)) return;
-
-       if (islink(fd->path))
-               {
-               UtilityData *ud;
-               gchar *text;
-
-               ud = g_new0(UtilityData, 1);
-               ud->type = UTILITY_TYPE_DELETE_LINK;
-               ud->source_fd = file_data_ref(fd);
-               ud->dlist = NULL;
-               ud->flist = NULL;
-
-               ud->gd = file_util_gen_dlg(_("Delete folder"), GQ_WMCLASS, "dlg_confirm",
-                                          parent, TRUE,
-                                          file_util_delete_dir_cancel_cb, ud);
-
-               text = g_strdup_printf(_("This will delete the symbolic link:\n\n%s\n\n"
-                                        "The folder this link points to will not be deleted."),
-                                       fd->path);
-               generic_dialog_add_message(ud->gd, GTK_STOCK_DIALOG_QUESTION,
-                                          _("Delete symbolic link to folder?"),
-                                          text);
-               g_free(text);
-
-               generic_dialog_add_button(ud->gd, GTK_STOCK_DELETE, NULL, file_util_delete_dir_ok_cb, TRUE);
-
-               gtk_widget_show(ud->gd->dialog);
-
-               return;
-               }
-
-       if (!access_file(fd->path, W_OK | X_OK))
-               {
-               gchar *text;
-
-               text = g_strdup_printf(_("Unable to remove folder %s\n"
-                                        "Permissions do not allow writing to the folder."), fd->path);
-               file_util_warning_dialog(_("Delete failed"), text, GTK_STOCK_DIALOG_ERROR, parent);
-               g_free(text);
-
-               return;
-               }
-
-       if (!filelist_read_lstat(fd->path, &flist, &dlist))
-               {
-               gchar *text;
-
-               text = g_strdup_printf(_("Unable to list contents of folder %s"), fd->path);
-               file_util_warning_dialog(_("Delete failed"), text, GTK_STOCK_DIALOG_ERROR, parent);
-               g_free(text);
-
-               return;
-               }
-
-       rlist = file_util_delete_dir_remaining_folders(dlist);
-       if (rlist)
-               {
-               GenericDialog *gd;
-               GtkWidget *box;
-               gchar *text;
-
-               gd = file_util_gen_dlg(_("Folder contains subfolders"), GQ_WMCLASS, "dlg_warning",
-                                       parent, TRUE, NULL, NULL);
-               generic_dialog_add_button(gd, GTK_STOCK_CLOSE, NULL, NULL, TRUE);
-
-               text = g_strdup_printf(_("Unable to delete the folder:\n\n%s\n\n"
-                                        "This folder contains subfolders which must be moved before it can be deleted."),
-                                       fd->path);
-               box = generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING,
-                                                _("Folder contains subfolders"),
-                                                text);
-               g_free(text);
-
-               box = pref_group_new(box, TRUE, _("Subfolders:"), GTK_ORIENTATION_VERTICAL);
-
-               rlist = filelist_sort_path(rlist);
-               file_util_dialog_add_list(box, rlist, FALSE);
-
-               gtk_widget_show(gd->dialog);
-               }
-       else
-               {
-               UtilityData *ud;
-               GtkWidget *box;
-               GtkWidget *view;
-               GtkTreeSelection *selection;
-               gchar *text;
-
-               ud = g_new0(UtilityData, 1);
-               ud->type = UTILITY_TYPE_DELETE_FOLDER;
-               ud->source_fd = file_data_ref(fd);
-               ud->dlist = dlist;
-               dlist = NULL;
-               ud->flist = filelist_sort_path(flist);
-               flist = NULL;
+       file_util_rename_dir_full(source_fd, new_path, parent, UTILITY_PHASE_ENTERING, done_func, done_data);
+}
 
-               ud->gd = file_util_gen_dlg(_("Delete folder"), GQ_WMCLASS, "dlg_confirm",
-                                          parent, TRUE, file_util_delete_dir_cancel_cb, ud);
-               generic_dialog_add_button(ud->gd, GTK_STOCK_DELETE, NULL, file_util_delete_dir_ok_cb, TRUE);
 
-               text = g_strdup_printf(_("This will delete the folder:\n\n%s\n\n"
-                                        "The contents of this folder will also be deleted."),
-                                       fd->path);
-               box = generic_dialog_add_message(ud->gd, GTK_STOCK_DIALOG_QUESTION,
-                                                _("Delete folder?"),
-                                                text);
-               g_free(text);
+void file_util_copy_path_to_clipboard(FileData *fd)
+{
+       GtkClipboard *clipboard;
 
-               box = pref_group_new(box, TRUE, _("Contents:"), GTK_ORIENTATION_HORIZONTAL);
+       if (!fd || !*fd->path) return;
 
-               view = file_util_dialog_add_list(box, ud->flist, FALSE);
-               selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
-               gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
-               gtk_tree_selection_set_select_function(selection, file_util_delete_dir_preview_cb, ud, NULL);
+       clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+       gtk_clipboard_set_text(clipboard, g_shell_quote(fd->path), -1);
+}
 
-               generic_dialog_add_image(ud->gd, box, NULL, NULL, NULL, NULL, FALSE);
+void file_util_copy_path_list_to_clipboard(GList *list)
+{
+       GtkClipboard *clipboard;
+       GList *work;
+       GString *new;
 
-               box_append_safe_delete_status(ud->gd);
+       clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+       
+       new = g_string_new("");
+       work = list;
+       while (work) {
+               FileData *fd = work->data;
+               work = work->next;
 
-               gtk_widget_show(ud->gd->dialog);
+               if (!fd || !*fd->path) continue;
+       
+               g_string_append(new, g_shell_quote(fd->path));
+               if (work) g_string_append_c(new, ' ');
                }
-
-       g_list_free(rlist);
-       filelist_free(dlist);
-       filelist_free(flist);
+       
+       gtk_clipboard_set_text(clipboard, new->str, new->len);
+       g_string_free(new, TRUE);
+       filelist_free(list);
 }
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */