Convert group_keys to std::array
[geeqie.git] / src / utilops.cc
index e972842..f65daba 100644 (file)
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "main.h"
 #include "utilops.h"
 
+#include <unistd.h>
+
+#include <cstring>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdk.h>
+#include <glib-object.h>
+
+#include <config.h>
+
 #include "cache.h"
+#include "compat.h"
+#include "debug.h"
+#include "editors.h"
+#include "exif.h"
 #include "filedata.h"
 #include "filefilter.h"
 #include "image.h"
+#include "intl.h"
+#include "main-defines.h"
+#include "metadata.h"
+#include "misc.h"
+#include "options.h"
 #include "thumb-standard.h"
 #include "trash.h"
 #include "ui-bookmark.h"
 #include "ui-fileops.h"
 #include "ui-misc.h"
-#include "editors.h"
-#include "metadata.h"
-#include "exif.h"
+#include "ui-utildlg.h"
+
+namespace
+{
+
+constexpr gint DIALOG_WIDTH = 750;
+
+/* thumbnail spec has a max depth of 4 (.thumb??/fail/appname/??.png) */
+constexpr gint UTILITY_DELETE_MAX_DEPTH = 5;
+
+struct PixmapErrors
+{
+       GdkPixbuf *error;
+       GdkPixbuf *warning;
+       GdkPixbuf *apply;
+};
+
+GdkPixbuf *file_util_get_error_icon(FileData *fd, GList *list, GtkWidget *)
+{
+       static PixmapErrors pe = []() -> PixmapErrors
+       {
+               GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
+
+               gint size;
+               if (!gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &size, &size))
+                       {
+                       size = 16;
+                       }
+
+               GdkPixbuf *pb_error = gq_gtk_icon_theme_load_icon_copy(icon_theme, GQ_ICON_DIALOG_ERROR, size, GTK_ICON_LOOKUP_USE_BUILTIN);
+               GdkPixbuf *pb_warning = gq_gtk_icon_theme_load_icon_copy(icon_theme, GQ_ICON_DIALOG_WARNING, size, GTK_ICON_LOOKUP_USE_BUILTIN);
+               GdkPixbuf *pb_apply = gq_gtk_icon_theme_load_icon_copy(icon_theme, GQ_ICON_APPLY, size, GTK_ICON_LOOKUP_USE_BUILTIN);
+               return {pb_error, pb_warning, pb_apply};
+       }();
+
+       gint error = file_data_sc_verify_ci(fd, list);
+
+       if (error & CHANGE_ERROR_MASK)
+               {
+               return pe.error;
+               }
+
+       if (error)
+               {
+               return pe.warning;
+               }
+
+       return pe.apply;
+}
 
-#define DIALOG_WIDTH 750
+} // namespace
 
-static GdkPixbuf *file_util_get_error_icon(FileData *fd, GList *list, GtkWidget *widget);
+enum ClipboardDestination {
+       CLIPBOARD_TEXT_PLAIN    = 0,
+       CLIPBOARD_TEXT_URI_LIST = 1,
+       CLIPBOARD_X_SPECIAL_GNOME_COPIED_FILES  = 2,
+       CLIPBOARD_UTF8_STRING   = 3
+};
 
 static GtkTargetEntry target_types[] =
 {
@@ -60,8 +129,10 @@ struct ClipboardData
  *--------------------------------------------------------------------------
  */
 
-#define DIALOG_DEF_IMAGE_DIM_X 150
-#define DIALOG_DEF_IMAGE_DIM_Y 100
+enum {
+       DIALOG_DEF_IMAGE_DIM_X = 150,
+       DIALOG_DEF_IMAGE_DIM_Y = 100
+};
 
 static void generic_dialog_add_image(GenericDialog *gd, GtkWidget *box,
                                     FileData *fd1, const gchar *header1,
@@ -88,15 +159,15 @@ static void generic_dialog_add_image(GenericDialog *gd, GtkWidget *box,
                {
                GtkWidget *sep;
 
-               gtk_box_pack_start(GTK_BOX(preview_box), vbox, FALSE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(preview_box), vbox, FALSE, TRUE, 0);
 
-               sep = gtk_hseparator_new();
-               gtk_box_pack_start(GTK_BOX(preview_box), sep, FALSE, FALSE, 0);
+               sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
+               gq_gtk_box_pack_start(GTK_BOX(preview_box), sep, FALSE, FALSE, 0);
                gtk_widget_show(sep);
                }
        else
                {
-               gtk_box_pack_start(GTK_BOX(box), vbox, FALSE, TRUE, PREF_PAD_GAP);
+               gq_gtk_box_pack_start(GTK_BOX(box), vbox, FALSE, TRUE, PREF_PAD_GAP);
                }
        gtk_widget_show(vbox);
 
@@ -113,7 +184,7 @@ static void generic_dialog_add_image(GenericDialog *gd, GtkWidget *box,
        imd = image_new(FALSE);
        g_object_set(G_OBJECT(imd->pr), "zoom_expand", FALSE, NULL);
        gtk_widget_set_size_request(imd->widget, DIALOG_DEF_IMAGE_DIM_X, DIALOG_DEF_IMAGE_DIM_Y);
-       gtk_box_pack_start(GTK_BOX(vbox), imd->widget, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), imd->widget, TRUE, TRUE, 0);
        image_change_fd(imd, fd1, 0.0);
        gtk_widget_show(imd->widget);
 
@@ -146,7 +217,7 @@ static void generic_dialog_add_image(GenericDialog *gd, GtkWidget *box,
                imd = image_new(FALSE);
                g_object_set(G_OBJECT(imd->pr), "zoom_expand", FALSE, NULL);
                gtk_widget_set_size_request(imd->widget, DIALOG_DEF_IMAGE_DIM_X, DIALOG_DEF_IMAGE_DIM_Y);
-               gtk_box_pack_start(GTK_BOX(vbox), imd->widget, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(vbox), imd->widget, TRUE, TRUE, 0);
                if (fd2) image_change_fd(imd, fd2, 0.0);
                gtk_widget_show(imd->widget);
 
@@ -165,6 +236,18 @@ static void generic_dialog_add_image(GenericDialog *gd, GtkWidget *box,
  *--------------------------------------------------------------------------
  */
 
+/**
+ * @brief
+ * @param title
+ * @param role
+ * @param parent
+ * @param auto_close
+ * @param cancel_cb
+ * @param data
+ * @returns
+ *
+ * \image html file_util_gen_dlg.png 'Typical implementation' width=200
+ */
 GenericDialog *file_util_gen_dlg(const gchar *title,
                                 const gchar *role,
                                 GtkWidget *parent, gboolean auto_close,
@@ -175,12 +258,23 @@ GenericDialog *file_util_gen_dlg(const gchar *title,
        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);
+               gq_gtk_window_set_position(GTK_WINDOW(gd->dialog), GTK_WIN_POS_MOUSE);
                }
 
        return gd;
 }
 
+/**
+ * @brief
+ * @param title
+ * @param role
+ * @param parent
+ * @param cancel_cb
+ * @param data
+ * @returns
+ *
+ * \image html file_util_file_dlg.png 'Typical implementation including optional filter, buttons and path widgets' width=300
+ */
 FileDialog *file_util_file_dlg(const gchar *title,
                               const gchar *role,
                               GtkWidget *parent,
@@ -191,9 +285,11 @@ FileDialog *file_util_file_dlg(const gchar *title,
        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);
+               gq_gtk_window_set_position(GTK_WINDOW(GENERIC_DIALOG(fdlg)->dialog), GTK_WIN_POS_MOUSE);
                }
 
+       gtk_window_set_modal(GTK_WINDOW(fdlg->gd.dialog), TRUE);
+
        return fdlg;
 }
 
@@ -201,22 +297,22 @@ FileDialog *file_util_file_dlg(const gchar *title,
  * because it does not have a mouse center option,
  * and we must center it before show, implement it here.
  */
-static void file_util_warning_dialog_ok_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
+static void file_util_warning_dialog_ok_cb(GenericDialog *, gpointer)
 {
        /* no op */
 }
 
 GenericDialog *file_util_warning_dialog(const gchar *heading, const gchar *message,
-                                       const gchar *icon_stock_id, GtkWidget *parent)
+                                       const gchar *icon_name, GtkWidget *parent)
 {
        GenericDialog *gd;
 
        gd = file_util_gen_dlg(heading, "warning", parent, TRUE, nullptr, nullptr);
-       generic_dialog_add_message(gd, icon_stock_id, heading, message, TRUE);
-       generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, file_util_warning_dialog_ok_cb, TRUE);
+       generic_dialog_add_message(gd, icon_name, heading, message, TRUE);
+       generic_dialog_add_button(gd, GQ_ICON_OK, "OK", file_util_warning_dialog_ok_cb, TRUE);
        if (options->place_dialogs_under_mouse)
                {
-               gtk_window_set_position(GTK_WINDOW(gd->dialog), GTK_WIN_POS_MOUSE);
+               gq_gtk_window_set_position(GTK_WINDOW(gd->dialog), GTK_WIN_POS_MOUSE);
                }
        gtk_widget_show(gd->dialog);
 
@@ -327,6 +423,7 @@ struct UtilityData {
 
        gchar *external_command;
        gpointer resume_data;
+       gboolean show_rename_button;
 
        FileUtilDoneFunc done_func;
        void (*details_func)(UtilityData *ud, FileData *fd);
@@ -400,11 +497,10 @@ static void generic_dialog_image_set(UtilityData *ud, FileData *fd)
 
 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
+enum {
+       UTILITY_LIST_MIN_WIDTH =  250,
+       UTILITY_LIST_MIN_HEIGHT = 150
+};
 
 static UtilityData *file_util_data_new(UtilityType type)
 {
@@ -415,6 +511,15 @@ static UtilityData *file_util_data_new(UtilityType type)
        ud->type = type;
        ud->phase = UTILITY_PHASE_START;
 
+       if (type == UTILITY_TYPE_CREATE_FOLDER)
+               {
+               ud->show_rename_button = FALSE;
+               }
+       else
+               {
+               ud->show_rename_button = TRUE;
+               }
+
        return ud;
 }
 
@@ -485,11 +590,11 @@ static GtkWidget *file_util_dialog_add_list(GtkWidget *box, GList *list, gboolea
        GtkWidget *view;
        GtkListStore *store;
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
+       gq_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);
+       gq_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);
@@ -511,7 +616,7 @@ static GtkWidget *file_util_dialog_add_list(GtkWidget *box, GList *list, gboolea
                }
 
        gtk_widget_set_size_request(view, UTILITY_LIST_MIN_WIDTH, UTILITY_LIST_MIN_HEIGHT);
-       gtk_container_add(GTK_CONTAINER(scrolled), view);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), view);
        gtk_widget_show(view);
 
        while (list)
@@ -548,7 +653,7 @@ static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GLi
 /* call file_util_perform_ci_internal or start_editor_from_filelist_full */
 
 
-static void file_util_resume_cb(GenericDialog *UNUSED(gd), gpointer data)
+static void file_util_resume_cb(GenericDialog *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        if (ud->external)
@@ -557,7 +662,7 @@ static void file_util_resume_cb(GenericDialog *UNUSED(gd), gpointer data)
                file_util_perform_ci_internal(ud);
 }
 
-static void file_util_abort_cb(GenericDialog *UNUSED(gd), gpointer data)
+static void file_util_abort_cb(GenericDialog *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        if (ud->external)
@@ -575,7 +680,7 @@ static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GLi
 
        ud->resume_data = resume_data;
 
-       if (EDITOR_ERRORS_BUT_SKIPPED(flags))
+       if (editor_errors_but_skipped(flags))
                {
                GString *msg = g_string_new(editor_get_error_str(flags));
                GenericDialog *d;
@@ -597,16 +702,16 @@ static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GLi
                                              nullptr, TRUE,
                                              file_util_abort_cb, ud);
 
-                       generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, nullptr, msg->str, TRUE);
+                       generic_dialog_add_message(d, GQ_ICON_DIALOG_WARNING, nullptr, msg->str, TRUE);
 
-                       generic_dialog_add_button(d, GTK_STOCK_GO_FORWARD, _("Co_ntinue"),
+                       generic_dialog_add_button(d, GQ_ICON_GO_NEXT, _("Co_ntinue"),
                                                  file_util_resume_cb, TRUE);
                        gtk_widget_show(d->dialog);
                        ret = EDITOR_CB_SUSPEND;
                        }
                else
                        {
-                       file_util_warning_dialog(ud->messages.fail, msg->str, GTK_STOCK_DIALOG_ERROR, nullptr);
+                       file_util_warning_dialog(ud->messages.fail, msg->str, GQ_ICON_DIALOG_ERROR, nullptr);
                        }
                g_string_free(msg, TRUE);
                }
@@ -617,7 +722,7 @@ static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GLi
                auto fd = static_cast<FileData *>(list->data);
                list = list->next;
 
-               if (!EDITOR_ERRORS(flags)) /* files were successfully deleted, call the maint functions */
+               if (!editor_errors(flags)) /* files were successfully deleted, call the maint functions */
                        {
                        if (ud->with_sidecars)
                                file_data_sc_apply_ci(fd);
@@ -717,7 +822,7 @@ static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolea
                                gchar *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, nullptr);
+                               file_util_warning_dialog(ud->messages.fail, text, GQ_ICON_DIALOG_ERROR, nullptr);
                                g_free(text);
                                }
                        file_data_free_ci(ud->dir_fd);
@@ -770,7 +875,7 @@ static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolea
                                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, nullptr);
+                               gd = file_util_warning_dialog(ud->messages.fail, text, GQ_ICON_DIALOG_ERROR, nullptr);
                                g_free(text);
 
                                if (fail != ud->dir_fd)
@@ -823,7 +928,7 @@ static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolea
                                gchar *text;
 
                                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, nullptr);
+                               file_util_warning_dialog(ud->messages.fail, text, GQ_ICON_DIALOG_ERROR, nullptr);
                                g_free(text);
 
                                file_data_unref(fail);
@@ -842,7 +947,7 @@ static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolea
                                gchar *text;
 
                                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, nullptr);
+                               file_util_warning_dialog(ud->messages.fail, text, GQ_ICON_DIALOG_ERROR, nullptr);
                                g_free(text);
                                }
 
@@ -855,10 +960,10 @@ static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolea
        file_util_dialog_run(ud);
 }
 
-static gint file_util_perform_ci_dir_cb(gpointer UNUSED(resume_data), EditorFlags flags, GList *UNUSED(list), gpointer data)
+static gint file_util_perform_ci_dir_cb(gpointer, EditorFlags flags, GList *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
-       file_util_perform_ci_dir(ud, FALSE, !EDITOR_ERRORS_BUT_SKIPPED(flags));
+       file_util_perform_ci_dir(ud, FALSE, !editor_errors_but_skipped(flags));
        return EDITOR_CB_CONTINUE; /* does not matter, there was just single directory */
 }
 
@@ -918,10 +1023,10 @@ void file_util_perform_ci(UtilityData *ud)
                                }
                        }
 
-               if (EDITOR_ERRORS(flags))
+               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, nullptr);
+                       file_util_warning_dialog(ud->messages.fail, text, GQ_ICON_DIALOG_ERROR, nullptr);
                        g_free(text);
 
                        ud->gd = nullptr;
@@ -943,50 +1048,14 @@ void file_util_perform_ci(UtilityData *ud)
                }
 }
 
-static GdkPixbuf *file_util_get_error_icon(FileData *fd, GList *list, GtkWidget *widget)
-{
-       static GdkPixbuf *pb_warning;
-       static GdkPixbuf *pb_error;
-       static GdkPixbuf *pb_apply;
-       gint error;
-
-       if (!pb_warning)
-               {
-               pb_warning = gtk_widget_render_icon(widget, GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU, nullptr);
-               }
-
-       if (!pb_error)
-               {
-               pb_error = gtk_widget_render_icon(widget, GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_MENU, nullptr);
-               }
-
-       if (!pb_apply)
-               {
-               pb_apply = gtk_widget_render_icon(widget, GTK_STOCK_APPLY, GTK_ICON_SIZE_MENU, nullptr);
-               }
-
-       error = file_data_sc_verify_ci(fd, list);
-
-       if (!error) return pb_apply;
-
-       if (error & CHANGE_ERROR_MASK)
-               {
-               return pb_error;
-               }
-       else
-               {
-               return pb_warning;
-               }
-}
-
-static void file_util_check_resume_cb(GenericDialog *UNUSED(gd), gpointer data)
+static void file_util_check_resume_cb(GenericDialog *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        ud->phase = UTILITY_PHASE_CHECKED;
        file_util_dialog_run(ud);
 }
 
-static void file_util_check_abort_cb(GenericDialog *UNUSED(gd), gpointer data)
+static void file_util_check_abort_cb(GenericDialog *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        ud->phase = UTILITY_PHASE_START;
@@ -1045,9 +1114,9 @@ void file_util_check_ci(UtilityData *ud)
                                        ud->parent, TRUE,
                                        file_util_check_abort_cb, ud);
 
-               generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("Really continue?"), desc, TRUE);
+               generic_dialog_add_message(d, GQ_ICON_DIALOG_WARNING, _("Really continue?"), desc, TRUE);
 
-               generic_dialog_add_button(d, GTK_STOCK_GO_FORWARD, _("Co_ntinue"),
+               generic_dialog_add_button(d, GQ_ICON_GO_NEXT, _("Co_ntinue"),
                                          file_util_check_resume_cb, TRUE);
                gtk_widget_show(d->dialog);
                }
@@ -1059,7 +1128,7 @@ void file_util_check_ci(UtilityData *ud)
                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, TRUE);
+               generic_dialog_add_message(d, GQ_ICON_DIALOG_WARNING, _("This operation can't continue:"), desc, TRUE);
 
                gtk_widget_show(d->dialog);
                }
@@ -1120,7 +1189,7 @@ static void file_util_fdlg_cancel_cb(FileDialog *fdlg, gpointer data)
 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)));
+       ud->dest_path = g_strdup(gq_gtk_entry_get_text(GTK_ENTRY(ud->fdlg->entry)));
 
        switch (ud->type)
                {
@@ -1173,7 +1242,7 @@ static void file_util_fdlg_rename_cb(FileDialog *fdlg, gpointer data)
                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, TRUE);
+               generic_dialog_add_message(d, GQ_ICON_DIALOG_WARNING, _("This operation can't continue:"), desc, TRUE);
 
                gtk_widget_show(d->dialog);
                ud->phase = UTILITY_PHASE_START;
@@ -1198,7 +1267,7 @@ static void file_util_fdlg_ok_cb(FileDialog *fdlg, gpointer data)
        file_util_dialog_run(ud);
 }
 
-static void file_util_dest_folder_entry_cb(GtkWidget *UNUSED(entry), gpointer data)
+static void file_util_dest_folder_entry_cb(GtkWidget *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        file_util_dest_folder_update_path(ud);
@@ -1268,8 +1337,10 @@ static void file_util_rename_preview_update(UtilityData *ud)
 {
        GtkTreeModel *store;
        GtkTreeSelection *selection;
-       GtkTreeIter iter, iter_selected;
-       GtkTreePath *path_iter, *path_selected;
+       GtkTreeIter iter;
+       GtkTreeIter iter_selected;
+       GtkTreePath *path_iter;
+       GtkTreePath *path_selected;
        const gchar *front;
        const gchar *end;
        const gchar *format;
@@ -1289,7 +1360,7 @@ static void file_util_rename_preview_update(UtilityData *ud)
                if (gtk_tree_selection_get_selected(selection, &store, &iter))
                        {
                        FileData *fd;
-                       const gchar *dest = gtk_entry_get_text(GTK_ENTRY(ud->rename_entry));
+                       const gchar *dest = gq_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 */
@@ -1319,11 +1390,11 @@ static void file_util_rename_preview_update(UtilityData *ud)
                }
        else
                {
-               front = gtk_entry_get_text(GTK_ENTRY(ud->auto_entry_front));
-               end = gtk_entry_get_text(GTK_ENTRY(ud->auto_entry_end));
+               front = gq_gtk_entry_get_text(GTK_ENTRY(ud->auto_entry_front));
+               end = gq_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));
 
-               format = gtk_entry_get_text(GTK_ENTRY(ud->format_entry));
+               format = gq_gtk_entry_get_text(GTK_ENTRY(ud->format_entry));
 
                g_free(options->cp_mv_rn.auto_end);
                options->cp_mv_rn.auto_end = g_strdup(end);
@@ -1419,13 +1490,13 @@ static void file_util_rename_preview_update(UtilityData *ud)
 
 }
 
-static void file_util_rename_preview_entry_cb(GtkWidget *UNUSED(entry), gpointer data)
+static void file_util_rename_preview_entry_cb(GtkWidget *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        file_util_rename_preview_update(ud);
 }
 
-static void file_util_rename_preview_adj_cb(GtkWidget *UNUSED(spin), gpointer data)
+static void file_util_rename_preview_adj_cb(GtkWidget *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        file_util_rename_preview_update(ud);
@@ -1441,8 +1512,7 @@ static gboolean file_util_rename_idle_cb(gpointer data)
        return G_SOURCE_REMOVE;
 }
 
-static void file_util_rename_preview_order_cb(GtkTreeModel *UNUSED(treemodel), GtkTreePath *UNUSED(tpath),
-                                             GtkTreeIter *UNUSED(iter), gpointer data)
+static void file_util_rename_preview_order_cb(GtkTreeModel *, GtkTreePath *, GtkTreeIter *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
 
@@ -1452,7 +1522,7 @@ static void file_util_rename_preview_order_cb(GtkTreeModel *UNUSED(treemodel), G
 }
 
 
-static gboolean file_util_preview_cb(GtkTreeSelection *UNUSED(selection), GtkTreeModel *store,
+static gboolean file_util_preview_cb(GtkTreeSelection *, GtkTreeModel *store,
                                     GtkTreePath *tpath, gboolean path_currently_selected,
                                     gpointer data)
 {
@@ -1475,7 +1545,7 @@ static gboolean file_util_preview_cb(GtkTreeSelection *UNUSED(selection), GtkTre
                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, (gpointer)(file_util_rename_preview_entry_cb), ud);
-               gtk_entry_set_text(GTK_ENTRY(ud->rename_entry), name);
+               gq_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, (gpointer)file_util_rename_preview_entry_cb, ud);
                }
@@ -1499,7 +1569,7 @@ static void box_append_safe_delete_status(GenericDialog *gd)
        gtk_widget_set_sensitive(label, FALSE);
 }
 
-static void file_util_details_cb(GenericDialog *UNUSED(gd), gpointer data)
+static void file_util_details_cb(GenericDialog *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        if (ud->details_func && ud->sel_fd)
@@ -1514,26 +1584,29 @@ static void file_util_dialog_init_simple_list(UtilityData *ud)
        GtkTreeSelection *selection;
        gchar *dir_msg;
 
-       const gchar *stock_id;
+       const gchar *icon_name;
+       const gchar *msg;
 
        /** @FIXME use ud->stock_id */
        if (ud->type == UTILITY_TYPE_DELETE ||
            ud->type == UTILITY_TYPE_DELETE_LINK ||
            ud->type == UTILITY_TYPE_DELETE_FOLDER)
                {
-               stock_id = GTK_STOCK_DELETE;
+               icon_name = GQ_ICON_DELETE;
+               msg = _("Delete");
                }
        else
                {
-               stock_id = GTK_STOCK_OK;
+               icon_name = GQ_ICON_OK;
+               msg = "OK";
                }
 
        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);
+       if (ud->discard_func) generic_dialog_add_button(ud->gd, GQ_ICON_REVERT, _("Discard changes"), file_util_discard_cb, FALSE);
+       if (ud->details_func) generic_dialog_add_button(ud->gd, GQ_ICON_DIALOG_INFO, _("File details"), file_util_details_cb, FALSE);
 
-       generic_dialog_add_button(ud->gd, stock_id, nullptr, file_util_ok_cb, TRUE);
+       generic_dialog_add_button(ud->gd, icon_name, msg, file_util_ok_cb, TRUE);
 
        if (ud->dir_fd)
                {
@@ -1544,7 +1617,7 @@ static void file_util_dialog_init_simple_list(UtilityData *ud)
                dir_msg = g_strdup("");
                }
 
-       box = generic_dialog_add_message(ud->gd, GTK_STOCK_DIALOG_QUESTION,
+       box = generic_dialog_add_message(ud->gd, GQ_ICON_DIALOG_QUESTION,
                                         ud->messages.question,
                                         dir_msg, TRUE);
 
@@ -1577,15 +1650,15 @@ static void file_util_dialog_init_dest_folder(UtilityData *ud)
 {
        FileDialog *fdlg;
        GtkWidget *label;
-       const gchar *stock_id;
+       const gchar *icon_name;
 
        if (ud->type == UTILITY_TYPE_COPY)
                {
-               stock_id = GTK_STOCK_COPY;
+               icon_name = GQ_ICON_COPY;
                }
        else
                {
-               stock_id = GTK_STOCK_OK;
+               icon_name = GQ_ICON_OK;
                }
 
        fdlg = file_util_file_dlg(ud->messages.title, "dlg_dest_folder", ud->parent,
@@ -1601,15 +1674,22 @@ static void file_util_dialog_init_dest_folder(UtilityData *ud)
 
        pref_spacer(GENERIC_DIALOG(fdlg)->vbox, 0);
 
-       if (options->with_rename)
+       if (ud->show_rename_button == TRUE)
                {
-               file_dialog_add_button(fdlg, stock_id, ud->messages.title, file_util_fdlg_ok_cb, TRUE);
-               file_dialog_add_button(fdlg, GTK_STOCK_EDIT, "With Rename", file_util_fdlg_rename_cb, TRUE);
+               if (options->with_rename)
+                       {
+                       file_dialog_add_button(fdlg, icon_name, ud->messages.title, file_util_fdlg_ok_cb, TRUE);
+                       file_dialog_add_button(fdlg, GQ_ICON_EDIT, _("With Rename"), file_util_fdlg_rename_cb, TRUE);
+                       }
+               else
+                       {
+                       file_dialog_add_button(fdlg, GQ_ICON_EDIT, _("With Rename"), file_util_fdlg_rename_cb, TRUE);
+                       file_dialog_add_button(fdlg, icon_name, ud->messages.title, file_util_fdlg_ok_cb, TRUE);
+                       }
                }
        else
                {
-               file_dialog_add_button(fdlg, GTK_STOCK_EDIT, "With Rename", file_util_fdlg_rename_cb, TRUE);
-               file_dialog_add_button(fdlg, stock_id, ud->messages.title, file_util_fdlg_ok_cb, TRUE);
+               file_dialog_add_button(fdlg, icon_name, ud->messages.title, file_util_fdlg_ok_cb, TRUE);
                }
 
        file_dialog_add_path_widgets(fdlg, nullptr, ud->dest_path, "move_copy", nullptr, nullptr);
@@ -1627,11 +1707,11 @@ static GtkWidget *furm_simple_vlabel(GtkWidget *box, const gchar *text, gboolean
        GtkWidget *label;
 
        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-       gtk_box_pack_start(GTK_BOX(box), vbox, expand, expand, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), vbox, expand, expand, 0);
        gtk_widget_show(vbox);
 
        label = gtk_label_new(text);
-       gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
        gtk_widget_show(label);
 
        return vbox;
@@ -1655,10 +1735,10 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
 
        box = generic_dialog_add_message(ud->gd, nullptr, ud->messages.question, nullptr, TRUE);
 
-       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 (ud->discard_func) generic_dialog_add_button(ud->gd, GQ_ICON_REVERT, _("Discard changes"), file_util_discard_cb, FALSE);
+       if (ud->details_func) generic_dialog_add_button(ud->gd, GQ_ICON_DIALOG_INFO, _("File details"), file_util_details_cb, FALSE);
 
-       generic_dialog_add_button(ud->gd, GTK_STOCK_OK, ud->messages.title, file_util_ok_cb, TRUE);
+       generic_dialog_add_button(ud->gd, GQ_ICON_OK, ud->messages.title, file_util_ok_cb, TRUE);
 
        if (ud->type == UTILITY_TYPE_COPY || ud->type == UTILITY_TYPE_MOVE)
                {
@@ -1681,10 +1761,6 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
        gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_SINGLE);
        gtk_tree_selection_set_select_function(selection, file_util_preview_cb, ud, nullptr);
 
-
-//     column = file_util_rename_multiple_add_column(rd, _("Preview"), RENAME_COLUMN_PREVIEW);
-//     gtk_tree_view_column_set_visible(column, FALSE);
-
        gtk_tree_view_set_reorderable(GTK_TREE_VIEW(ud->listview), TRUE);
 
        store = gtk_tree_view_get_model(GTK_TREE_VIEW(ud->listview));
@@ -1694,20 +1770,19 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
 
        if (second_image)
                {
-               generic_dialog_add_image(ud->gd, box, nullptr, "Source", TRUE, nullptr, "Destination", TRUE);
+               generic_dialog_add_image(ud->gd, box, nullptr, _("Source"), TRUE, nullptr, _("Destination"), TRUE);
                }
        else
                {
                generic_dialog_add_image(ud->gd, box, nullptr, nullptr, FALSE, nullptr, nullptr, FALSE);
                }
 
-//     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);
+       gq_gtk_box_pack_start(GTK_BOX(ud->gd->vbox), ud->notebook, FALSE, FALSE, 0);
        gtk_widget_show(ud->notebook);
 
 
@@ -1717,13 +1792,13 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
 
        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, 0, _("Original name:"), GTK_ALIGN_END);
+       ud->rename_label = pref_table_label(table, 1, 0, "", GTK_ALIGN_START);
 
-       pref_table_label(table, 0, 1, _("New name:"), 1.0);
+       pref_table_label(table, 0, 1, _("New name:"), GTK_ALIGN_END);
 
        ud->rename_entry = gtk_entry_new();
-       gtk_table_attach(GTK_TABLE(table), ud->rename_entry, 1, 2, 1, 2, static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), static_cast<GtkAttachOptions>(0), 0, 0);
+       gq_gtk_grid_attach(GTK_GRID(table), ud->rename_entry, 1, 2, 1, 2, static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), static_cast<GtkAttachOptions>(0), 0, 0);
        generic_dialog_attach_default(GENERIC_DIALOG(ud->gd), ud->rename_entry);
        gtk_widget_grab_focus(ud->rename_entry);
 
@@ -1744,7 +1819,7 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
        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);
+       gq_gtk_box_pack_start(GTK_BOX(box2), combo, TRUE, TRUE, 0);
        gtk_widget_show(combo);
 
        box2 = furm_simple_vlabel(hbox, _("Start #"), FALSE);
@@ -1758,7 +1833,7 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
        combo = history_combo_new(&ud->auto_entry_end, options->cp_mv_rn.auto_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);
+       gq_gtk_box_pack_start(GTK_BOX(box2), combo, TRUE, TRUE, 0);
        gtk_widget_show(combo);
 
        ud->auto_spin_pad = pref_spin_new(page, _("Padding:"), nullptr,
@@ -1776,7 +1851,7 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
        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);
+       gq_gtk_box_pack_start(GTK_BOX(box2), combo, TRUE, TRUE, 0);
        gtk_widget_show(combo);
 
        box2 = furm_simple_vlabel(hbox, _("Start #"), FALSE);
@@ -1785,8 +1860,6 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
                                        0.0, 1000000.0, 1.0, 0, options->cp_mv_rn.formatted_start,
                                        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);
 }
 
@@ -1923,13 +1996,12 @@ void file_util_dialog_run(UtilityData *ud)
 
 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, nullptr);
+       file_util_warning_dialog(title, _("Another operation in progress.\n"), GQ_ICON_DIALOG_ERROR, nullptr);
 }
 
-static void file_util_details_dialog_close_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void file_util_details_dialog_close_cb(GtkWidget *, gpointer data)
 {
-       gtk_widget_destroy(GTK_WIDGET(data));
-
+       gq_gtk_widget_destroy(GTK_WIDGET(data));
 }
 
 static void file_util_details_dialog_destroy_cb(GtkWidget *widget, gpointer data)
@@ -1939,7 +2011,7 @@ static void file_util_details_dialog_destroy_cb(GtkWidget *widget, gpointer data
 }
 
 
-static void file_util_details_dialog_ok_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
+static void file_util_details_dialog_ok_cb(GenericDialog *, gpointer)
 {
        /* no op */
 }
@@ -1975,7 +2047,7 @@ static void file_util_details_dialog_discard_cb(GenericDialog *gd, gpointer data
        file_util_details_dialog_exclude(gd, data, TRUE);
 }
 
-static gchar *file_util_details_get_message(UtilityData *ud, FileData *fd, const gchar **stock_id)
+static gchar *file_util_details_get_message(UtilityData *ud, FileData *fd, const gchar **icon_name)
 {
        GString *message = g_string_new("");
        gint error;
@@ -2002,12 +2074,13 @@ static gchar *file_util_details_get_message(UtilityData *ud, FileData *fd, const
                {
                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;
+               if (icon_name) *icon_name = (error & CHANGE_ERROR_MASK) ? GQ_ICON_DIALOG_ERROR : GQ_ICON_DIALOG_WARNING;
+               g_free(err_msg);
                }
        else
                {
                g_string_append(message, _("no problem detected"));
-               if (stock_id) *stock_id = GTK_STOCK_DIALOG_INFO;
+               if (icon_name) *icon_name = GQ_ICON_DIALOG_INFO;
                }
 
        return g_string_free(message, FALSE);;
@@ -2018,11 +2091,11 @@ static void file_util_details_dialog(UtilityData *ud, FileData *fd)
        GenericDialog *gd;
        GtkWidget *box;
        gchar *message;
-       const gchar *stock_id;
+       const gchar *icon_name;
 
        gd = file_util_gen_dlg(_("File details"), "details", ud->gd->dialog, TRUE, nullptr, ud);
-       generic_dialog_add_button(gd, GTK_STOCK_CLOSE, nullptr, 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, GQ_ICON_CLOSE, _("Close"), file_util_details_dialog_ok_cb, TRUE);
+       generic_dialog_add_button(gd, GQ_ICON_REMOVE, _("Exclude file"), file_util_details_dialog_exclude_cb, FALSE);
 
        g_object_set_data(G_OBJECT(gd->dialog), "file_data", fd);
 
@@ -2034,9 +2107,9 @@ static void file_util_details_dialog(UtilityData *ud, FileData *fd)
                         G_CALLBACK(file_util_details_dialog_close_cb), gd->dialog);
 
 
-       message = file_util_details_get_message(ud, fd, &stock_id);
+       message = file_util_details_get_message(ud, fd, &icon_name);
 
-       box = generic_dialog_add_message(gd, stock_id, _("File details"), message, TRUE);
+       box = generic_dialog_add_message(gd, icon_name, _("File details"), message, TRUE);
 
        generic_dialog_add_image(gd, box, fd, nullptr, FALSE, nullptr, nullptr, FALSE);
 
@@ -2057,7 +2130,7 @@ static void file_util_write_metadata_details_dialog(UtilityData *ud, FileData *f
        gchar *message1;
        gchar *message2;
        gint i;
-       const gchar *stock_id;
+       const gchar *icon_name;
 
        if (fd && fd->modified_xmp)
                {
@@ -2068,9 +2141,9 @@ static void file_util_write_metadata_details_dialog(UtilityData *ud, FileData *f
 
 
        gd = file_util_gen_dlg(_("Overview of changed metadata"), "details", ud->gd->dialog, TRUE, nullptr, ud);
-       generic_dialog_add_button(gd, GTK_STOCK_CLOSE, nullptr, 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);
+       generic_dialog_add_button(gd, GQ_ICON_CLOSE, _("Close"), file_util_details_dialog_ok_cb, TRUE);
+       generic_dialog_add_button(gd, GQ_ICON_REMOVE, _("Exclude file"), file_util_details_dialog_exclude_cb, FALSE);
+       generic_dialog_add_button(gd, GQ_ICON_REVERT, _("Discard changes"), file_util_details_dialog_discard_cb, FALSE);
 
        g_object_set_data(G_OBJECT(gd->dialog), "file_data", fd);
 
@@ -2081,7 +2154,7 @@ static void file_util_write_metadata_details_dialog(UtilityData *ud, FileData *f
        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);
+       message1 = file_util_details_get_message(ud, fd, &icon_name);
 
        if (fd->change && fd->change->dest)
                {
@@ -2092,7 +2165,7 @@ static void file_util_write_metadata_details_dialog(UtilityData *ud, FileData *f
                message2 = g_strdup_printf(_("The following metadata tags will be written to the image file itself."));
                }
 
-       box = generic_dialog_add_message(gd, stock_id, _("Overview of changed metadata"), message1, TRUE);
+       box = generic_dialog_add_message(gd, icon_name, _("Overview of changed metadata"), message1, TRUE);
 
        box = pref_group_new(box, TRUE, message2, GTK_ORIENTATION_HORIZONTAL);
 
@@ -2115,10 +2188,7 @@ static void file_util_write_metadata_details_dialog(UtilityData *ud, FileData *f
                gtk_label_set_yalign(GTK_LABEL(label), 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);
+               gq_gtk_grid_attach(GTK_GRID(table), label, 0, 1, i, i + 1,  GTK_FILL, GTK_FILL,  2, 2);
                gtk_widget_show(label);
 
                label = gtk_label_new(value);
@@ -2127,10 +2197,7 @@ static void file_util_write_metadata_details_dialog(UtilityData *ud, FileData *f
                gtk_label_set_yalign(GTK_LABEL(label), 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);
+               gq_gtk_grid_attach(GTK_GRID(table), label,  1, 2, i, i + 1, GTK_FILL, GTK_FILL,  2, 2);
                gtk_widget_show(label);
 
                g_free(title);
@@ -2658,8 +2725,7 @@ static void file_util_delete_dir_full(FileData *fd, GtkWidget *parent, UtilityPh
                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.desc_source_fd = _("This will delete the symbolic link.\nThe folder this link points to will not be deleted.");
                ud->messages.fail = _("Link deletion failed");
 
                file_util_dialog_run(ud);
@@ -2670,9 +2736,8 @@ static void file_util_delete_dir_full(FileData *fd, GtkWidget *parent, UtilityPh
                {
                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);
+               text = g_strdup_printf(_("Unable to remove folder %s\nPermissions do not allow writing to the folder."), fd->path);
+               file_util_warning_dialog(_("Delete failed"), text, GQ_ICON_DIALOG_ERROR, parent);
                g_free(text);
 
                return;
@@ -2683,7 +2748,7 @@ static void file_util_delete_dir_full(FileData *fd, GtkWidget *parent, UtilityPh
                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);
+               file_util_warning_dialog(_("Delete failed"), text, GQ_ICON_DIALOG_ERROR, parent);
                g_free(text);
 
                return;
@@ -2698,12 +2763,11 @@ static void file_util_delete_dir_full(FileData *fd, GtkWidget *parent, UtilityPh
 
                gd = file_util_gen_dlg(_("Folder contains subfolders"), "dlg_warning",
                                        parent, TRUE, nullptr, nullptr);
-               generic_dialog_add_button(gd, GTK_STOCK_CLOSE, nullptr, nullptr, TRUE);
+               generic_dialog_add_button(gd, GQ_ICON_CLOSE, _("Close"), nullptr, 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."),
+               text = g_strdup_printf(_("Unable to delete the folder:\n\n%s\n\nThis folder contains subfolders which must be moved before it can be deleted."),
                                        fd->path);
-               box = generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING,
+               box = generic_dialog_add_message(gd, GQ_ICON_DIALOG_WARNING,
                                                 _("Folder contains subfolders"),
                                                 text, TRUE);
                g_free(text);
@@ -2731,8 +2795,7 @@ static void file_util_delete_dir_full(FileData *fd, GtkWidget *parent, UtilityPh
                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.desc_source_fd = _("This will delete the folder.\nThe contents of this folder will also be deleted.");
                ud->messages.fail = _("File deletion failed");
 
                if (!file_util_delete_dir_prepare(ud, flist, dlist))
@@ -2740,7 +2803,7 @@ static void file_util_delete_dir_full(FileData *fd, GtkWidget *parent, UtilityPh
                        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);
+                       file_util_warning_dialog(_("Delete failed"), text, GQ_ICON_DIALOG_ERROR, parent);
                        g_free(text);
                        file_data_unref(ud->dir_fd);
                        file_util_data_free(ud);
@@ -2873,12 +2936,10 @@ static void file_util_rename_dir_full(FileData *fd, const gchar *new_path, GtkWi
                return;
                }
 
-//     ud->flist = filelist_recursive(fd);
-
        file_util_dialog_run(ud);
 }
 
-static void file_util_create_dir_full(FileData *fd, const gchar *dest_path, GtkWidget *parent, UtilityPhase phase, FileUtilDoneFunc done_func, gpointer done_data)
+static void file_util_create_dir_full(const gchar *path, const gchar *dest_path, GtkWidget *parent, UtilityPhase phase, FileUtilDoneFunc done_func, gpointer done_data)
 {
        UtilityData *ud;
 
@@ -2899,17 +2960,9 @@ static void file_util_create_dir_full(FileData *fd, const gchar *dest_path, GtkW
                }
        else
                {
-               gchar *buf = new_folder(GTK_WINDOW(parent), fd->path);
-               if (!buf)
-                       {
-                       ud->phase = UTILITY_PHASE_CANCEL;
-                       ud->dir_fd = nullptr;
-                       }
-               else
-                       {
-                       ud->dest_path = buf;
-                       ud->dir_fd = file_data_new_dir(ud->dest_path);
-                       }
+               gchar *buf = g_build_filename(path, _("New folder"), nullptr);
+               ud->dest_path = unique_filename(buf, nullptr, " ", FALSE);
+               g_free(buf);
                }
 
        ud->done_func = done_func;
@@ -2924,7 +2977,6 @@ static void file_util_create_dir_full(FileData *fd, const gchar *dest_path, GtkW
        file_util_dialog_run(ud);
 }
 
-
 static gboolean file_util_write_metadata_first_after_done(gpointer data)
 {
        auto dd = static_cast<UtilityDelayData *>(data);
@@ -2948,7 +3000,7 @@ static gboolean file_util_write_metadata_first_after_done(gpointer data)
        return G_SOURCE_REMOVE;
 }
 
-static void file_util_write_metadata_first_done(gboolean success, const gchar *UNUSED(done_path), gpointer data)
+static void file_util_write_metadata_first_done(gboolean success, const gchar *, gpointer data)
 {
        auto dd = static_cast<UtilityDelayData *>(data);
 
@@ -3013,7 +3065,14 @@ static gboolean file_util_write_metadata_first(UtilityType type, UtilityPhase ph
 
 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, nullptr, nullptr);
+       if (options->file_ops.safe_delete_enable == FALSE)
+               {
+               file_util_delete_full(source_fd, source_list, parent, options->file_ops.confirm_delete ? UTILITY_PHASE_START : UTILITY_PHASE_ENTERING, nullptr, nullptr);
+               }
+       else
+               {
+               file_util_delete_full(source_fd, source_list, parent, options->file_ops.confirm_move_to_trash ? UTILITY_PHASE_START : UTILITY_PHASE_ENTERING, nullptr, nullptr);
+               }
 }
 
 void file_util_delete_notify_done(FileData *source_fd, GList *source_list, GtkWidget *parent, FileUtilDoneFunc done_func, gpointer done_data)
@@ -3072,10 +3131,13 @@ void file_util_start_editor_from_filelist(const gchar *key, GList *list, const g
        file_util_start_editor_full(key, nullptr, list, nullptr, working_directory, parent, UTILITY_PHASE_ENTERING);
 }
 
-//void file_util_start_filter_from_file(const gchar *key, FileData *fd, const gchar *dest_path, GtkWidget *parent)
-//{
-       //file_util_start_editor_full(key, fd, NULL, dest_path, NULL, parent, UTILITY_PHASE_ENTERING);
-//}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+void file_util_start_filter_from_file_unused(const gchar *key, FileData *fd, const gchar *dest_path, GtkWidget *parent)
+{
+       file_util_start_editor_full(key, fd, nullptr, dest_path, nullptr, parent, UTILITY_PHASE_ENTERING);
+}
+#pragma GCC diagnostic pop
 
 void file_util_start_filter_from_filelist(const gchar *key, GList *list, const gchar *dest_path, GtkWidget *parent)
 {
@@ -3087,9 +3149,9 @@ void file_util_delete_dir(FileData *fd, GtkWidget *parent)
        file_util_delete_dir_full(fd, parent, UTILITY_PHASE_START);
 }
 
-void file_util_create_dir(FileData *dir_fd, GtkWidget *parent, FileUtilDoneFunc done_func, gpointer done_data)
+void file_util_create_dir(const gchar *path, GtkWidget *parent, FileUtilDoneFunc done_func, gpointer done_data)
 {
-       file_util_create_dir_full(dir_fd, nullptr, parent, UTILITY_PHASE_ENTERING, done_func, done_data);
+       file_util_create_dir_full(path, nullptr, parent, UTILITY_PHASE_START, done_func, done_data);
 }
 
 void file_util_rename_dir(FileData *source_fd, const gchar *new_path, GtkWidget *parent, FileUtilDoneFunc done_func, gpointer done_data)
@@ -3106,6 +3168,12 @@ void file_util_rename_dir(FileData *source_fd, const gchar *new_path, GtkWidget
  *
  *
  */
+#if HAVE_GTK4
+static void clipboard_get_func(GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info, gpointer data)
+{
+/* @FIXME GTK4 stub */
+}
+#else
 static void clipboard_get_func(GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info, gpointer data)
 {
        auto cbd = static_cast<ClipboardData *>(data);
@@ -3158,10 +3226,11 @@ static void clipboard_get_func(GtkClipboard *clipboard, GtkSelectionData *select
                        }
                }
 
-       gtk_selection_data_set(selection_data, gtk_selection_data_get_target(selection_data), 8, reinterpret_cast<guchar *>(path_list_str->str), strlen(path_list_str->str));
+       gtk_selection_data_set(selection_data, gtk_selection_data_get_target(selection_data), 8, reinterpret_cast<guchar *>(path_list_str->str), path_list_str->len);
 
        g_string_free(path_list_str, TRUE);
 }
+#endif
 
 /**
  * @brief
@@ -3170,11 +3239,11 @@ static void clipboard_get_func(GtkClipboard *clipboard, GtkSelectionData *select
  *
  *
  */
-static void clipboard_clear_func(GtkClipboard *UNUSED(clipboard), gpointer data)
+static void clipboard_clear_func(GtkClipboard *, gpointer data)
 {
        auto cbd = static_cast<ClipboardData *>(data);
 
-       string_list_free(cbd->path_list);
+       g_list_free_full(cbd->path_list, g_free);
        g_free(cbd);
 }
 
@@ -3262,119 +3331,4 @@ void file_util_copy_path_list_to_clipboard(GList *fd_list, gboolean quoted)
        filelist_free(fd_list);
 }
 
-static void new_folder_entry_activate_cb(GtkWidget *UNUSED(widget), gpointer data)
-{
-       auto dialog = static_cast<GtkDialog *>(data);
-
-       gtk_dialog_response(dialog, GTK_RESPONSE_ACCEPT);
-}
-
-gchar *new_folder(GtkWindow *window , gchar *path)
-{
-       GtkWidget *hbox;
-       GtkWidget *vbox;
-       GtkWidget *label;
-       gchar *buf;
-       gchar *folder_name;
-       gchar *folder_path;
-       GtkWidget *image;
-       GtkWidget *folder_name_entry;
-       GtkWidget *dialog;
-       GtkWidget *dialog_warning;
-       GtkWidget *content_area;
-       gboolean ok_or_cancel = FALSE;
-       gint result;
-       gchar *new_folder_name;
-       gchar *new_folder_path_full = nullptr;
-       gchar *window_title;
-       PangoLayout *layout;
-       gint width, height;
-
-       buf = g_build_filename(path, _("New folder"), NULL);
-       folder_path = unique_filename(buf, nullptr, " ", FALSE);
-       folder_name = g_path_get_basename(folder_path);
-       window_title = g_strconcat(_("Create Folder - "), GQ_APPNAME, NULL);
-
-       dialog = gtk_dialog_new_with_buttons(window_title,
-                                                                               GTK_WINDOW(window),
-                                                                               GTK_DIALOG_MODAL,
-                                                                               GTK_STOCK_CANCEL,
-                                                                               GTK_RESPONSE_REJECT,
-                                                                               GTK_STOCK_OK,
-                                                                               GTK_RESPONSE_ACCEPT,
-                                                                               NULL);
-
-       layout = gtk_widget_create_pango_layout(GTK_WIDGET(dialog), window_title);
-       pango_layout_get_pixel_size(layout, &width, &height);
-       gtk_window_set_default_size(GTK_WINDOW(dialog), width * 2, -1);
-
-       content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
-       vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
-       gtk_box_pack_start(GTK_BOX(content_area), vbox, FALSE, FALSE, 0);
-
-       hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
-       gtk_container_set_border_width(GTK_CONTAINER(hbox), PREF_PAD_GAP);
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-       image = gtk_image_new_from_icon_name("dialog-question", GTK_ICON_SIZE_DIALOG);
-       gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
-       label = gtk_label_new(_("Create new folder"));
-       gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-
-       folder_name_entry = gtk_entry_new();
-       gtk_entry_set_text(GTK_ENTRY(folder_name_entry), folder_name);
-       gtk_box_pack_start(GTK_BOX(vbox), folder_name_entry, FALSE, FALSE, PREF_PAD_SPACE);
-       g_signal_connect(G_OBJECT(folder_name_entry), "activate", G_CALLBACK(new_folder_entry_activate_cb), dialog);
-
-       gtk_widget_show_all(dialog);
-
-       while (ok_or_cancel == FALSE)
-               {
-               result = gtk_dialog_run(GTK_DIALOG(dialog));
-
-               switch (result)
-                       {
-                       case GTK_RESPONSE_ACCEPT:
-                               new_folder_name = g_strdup(gtk_entry_get_text(GTK_ENTRY(folder_name_entry)));
-                               new_folder_path_full = g_build_filename(path, new_folder_name, NULL);
-                               if (isname(new_folder_path_full))
-                                       {
-                                       dialog_warning = gtk_message_dialog_new(GTK_WINDOW(window),
-                                                                                       GTK_DIALOG_MODAL,
-                                                                                       GTK_MESSAGE_WARNING,
-                                                                                       GTK_BUTTONS_OK,
-                                                                                       _("Cannot create folder:"));
-                                       gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog_warning), "%s", new_folder_name);
-                                       gtk_window_set_title(GTK_WINDOW(dialog_warning), GQ_APPNAME);
-
-                                       gtk_dialog_run(GTK_DIALOG(dialog_warning));
-
-                                       gtk_widget_destroy(dialog_warning);
-                                       g_free(new_folder_path_full);
-                                       new_folder_path_full = nullptr;
-                                       g_free(new_folder_name);
-                                       ok_or_cancel = FALSE;
-                                       }
-                               else
-                                       {
-                                       ok_or_cancel = TRUE;
-                                       }
-                               break;
-                       case GTK_RESPONSE_REJECT:
-                               ok_or_cancel = TRUE;
-                               break;
-                       default:
-                               ok_or_cancel = TRUE;
-                               break;
-                 }
-               }
-
-       g_free(buf);
-       g_free(folder_path);
-       g_free(folder_name);
-       g_object_unref(layout);
-       g_free(window_title);
-       gtk_widget_destroy(dialog);
-
-       return new_folder_path_full;
-}
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */