#include "utilops.h"
#include "cache.h"
+#include "editors.h"
+#include "exif.h"
#include "filedata.h"
#include "filefilter.h"
#include "image.h"
+#include "metadata.h"
+#include "misc.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"
-#define DIALOG_WIDTH 750
+namespace
+{
+
+struct PixmapErrors
+{
+ GdkPixbuf *error;
+ GdkPixbuf *warning;
+ GdkPixbuf *apply;
+};
+
+GdkPixbuf *file_util_get_error_icon(FileData *fd, GList *list, GtkWidget *widget)
+{
+ static PixmapErrors pe = [widget]() -> PixmapErrors
+ {
+ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
-static GdkPixbuf *file_util_get_error_icon(FileData *fd, GList *list, GtkWidget *widget);
+ 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;
+}
+
+}
+
+enum {
+ DIALOG_WIDTH = 750
+};
+
+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[] =
{
- {(gchar *)"text/plain", 0, CLIPBOARD_TEXT_PLAIN},
- {(gchar *)"text/uri-list", 0, CLIPBOARD_TEXT_URI_LIST},
- {(gchar *)"x-special/gnome-copied-files", 0, CLIPBOARD_X_SPECIAL_GNOME_COPIED_FILES},
- {(gchar *)"UTF8_STRING", 0, CLIPBOARD_UTF8_STRING}
+ {const_cast<gchar *>("text/plain"), 0, CLIPBOARD_TEXT_PLAIN},
+ {const_cast<gchar *>("text/uri-list"), 0, CLIPBOARD_TEXT_URI_LIST},
+ {const_cast<gchar *>("x-special/gnome-copied-files"), 0, CLIPBOARD_X_SPECIAL_GNOME_COPIED_FILES},
+ {const_cast<gchar *>("UTF8_STRING"), 0, CLIPBOARD_UTF8_STRING},
};
static gint target_types_n = 4;
-typedef struct _ClipboardData ClipboardData;
-struct _ClipboardData
+struct ClipboardData
{
GList *path_list; /**< g_strdup(fd->path) */
gboolean quoted;
*--------------------------------------------------------------------------
*/
-#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,
gboolean show_filename)
{
ImageWindow *imd;
- GtkWidget *preview_box = NULL;
+ GtkWidget *preview_box = nullptr;
GtkWidget *vbox;
- GtkWidget *label = NULL;
+ GtkWidget *label = nullptr;
if (!box) box = gd->vbox;
{
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);
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);
if (show_filename)
{
- label = pref_label_new(vbox, (fd1 == NULL) ? "" : fd1->name);
+ label = pref_label_new(vbox, (fd1 == nullptr) ? "" : fd1->name);
}
/* only the first image is stored (for use in gd_image_set) */
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);
if (show_filename)
{
- label = pref_label_new(vbox, (fd2 == NULL) ? "" : fd2->name);
+ label = pref_label_new(vbox, (fd2 == nullptr) ? "" : fd2->name);
}
g_object_set_data(G_OBJECT(gd->dialog), "img_image2", imd);
g_object_set_data(G_OBJECT(gd->dialog), "img_label2", label);
*--------------------------------------------------------------------------
*/
+/**
+ * @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,
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,
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;
}
* 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, NULL, NULL);
- generic_dialog_add_message(gd, icon_stock_id, heading, message, TRUE);
- generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, file_util_warning_dialog_ok_cb, TRUE);
+ gd = file_util_gen_dlg(heading, "warning", parent, TRUE, nullptr, nullptr);
+ 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);
-typedef enum {
+enum UtilityType {
UTILITY_TYPE_COPY,
UTILITY_TYPE_MOVE,
UTILITY_TYPE_RENAME,
UTILITY_TYPE_DELETE_FOLDER,
UTILITY_TYPE_CREATE_FOLDER,
UTILITY_TYPE_WRITE_METADATA
-} UtilityType;
+};
-typedef enum {
+enum UtilityPhase {
UTILITY_PHASE_START = 0,
UTILITY_PHASE_INTERMEDIATE,
UTILITY_PHASE_ENTERING,
UTILITY_PHASE_DONE,
UTILITY_PHASE_CANCEL,
UTILITY_PHASE_DISCARD
-} UtilityPhase;
+};
enum {
UTILITY_RENAME = 0,
UTILITY_RENAME_FORMATTED
};
-typedef struct _UtilityDataMessages UtilityDataMessages;
-struct _UtilityDataMessages {
- gchar *title;
- gchar *question;
- gchar *desc_flist;
- gchar *desc_source_fd;
- gchar *fail;
+struct UtilityDataMessages {
+ const gchar *title;
+ const gchar *question;
+ const gchar *desc_flist;
+ const gchar *desc_source_fd;
+ const gchar *fail;
};
-typedef struct _UtilityData UtilityData;
-
-struct _UtilityData {
+struct UtilityData {
UtilityType type;
UtilityPhase phase;
gchar *external_command;
gpointer resume_data;
+ gboolean show_rename_button;
FileUtilDoneFunc done_func;
void (*details_func)(UtilityData *ud, FileData *fd);
UTILITY_COLUMN_COUNT
};
-typedef struct _UtilityDelayData UtilityDelayData;
-
-struct _UtilityDelayData {
+struct UtilityDelayData {
UtilityType type;
UtilityPhase phase;
GList *flist;
{
ImageWindow *imd;
GtkWidget *label;
- FileData *fd2 = NULL;
+ FileData *fd2 = nullptr;
gchar *buf;
- imd = g_object_get_data(G_OBJECT(ud->gd->dialog), "img_image");
- label = g_object_get_data(G_OBJECT(ud->gd->dialog), "img_label");
+ imd = static_cast<ImageWindow *>(g_object_get_data(G_OBJECT(ud->gd->dialog), "img_image"));
+ label = static_cast<GtkWidget *>(g_object_get_data(G_OBJECT(ud->gd->dialog), "img_label"));
if (!imd) return;
if (ud->type == UTILITY_TYPE_RENAME || ud->type == UTILITY_TYPE_COPY || ud->type == UTILITY_TYPE_MOVE)
{
- imd = g_object_get_data(G_OBJECT(ud->gd->dialog), "img_image2");
- label = g_object_get_data(G_OBJECT(ud->gd->dialog), "img_label2");
+ imd = static_cast<ImageWindow *>(g_object_get_data(G_OBJECT(ud->gd->dialog), "img_image2"));
+ label = static_cast<GtkWidget *>(g_object_get_data(G_OBJECT(ud->gd->dialog), "img_label2"));
if (imd)
{
}
else
{
- image_change_fd(imd, NULL, 0.0);
+ image_change_fd(imd, nullptr, 0.0);
if (label) gtk_label_set_text(GTK_LABEL(label), "");
}
}
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
+enum {
+ UTILITY_LIST_MIN_WIDTH = 250,
+ 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_DELETE_MAX_DEPTH = 5
+};
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;
}
GtkTreeSelection *selection;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
- if (gtk_tree_model_iter_nth_child(store, &iter, NULL, n))
+ if (gtk_tree_model_iter_nth_child(store, &iter, nullptr, n))
{
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
gtk_tree_selection_select_iter(selection, &iter);
GtkWidget *view;
GtkListStore *store;
- scrolled = gtk_scrolled_window_new(NULL, NULL);
- 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);
}
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)
{
- FileData *fd = list->data;
+ auto fd = static_cast<FileData *>(list->data);
GtkTreeIter iter;
gchar *sidecars;
- sidecars = with_sidecars ? file_data_sc_list_to_string(fd) : NULL;
+ sidecars = with_sidecars ? file_data_sc_list_to_string(fd) : nullptr;
GdkPixbuf *icon = file_util_get_error_icon(fd, list, view);
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
/* 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)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(data);
if (ud->external)
editor_resume(ud->resume_data);
else
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)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(data);
if (ud->external)
editor_skip(ud->resume_data);
else
- file_util_perform_ci_cb(NULL, EDITOR_ERROR_SKIPPED, ud->flist, ud);
+ file_util_perform_ci_cb(nullptr, EDITOR_ERROR_SKIPPED, ud->flist, ud);
}
static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GList *list, gpointer data)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(data);
gint ret = EDITOR_CB_CONTINUE;
ud->resume_data = resume_data;
g_string_append(msg, "\n");
while (list)
{
- FileData *fd = list->data;
+ auto fd = static_cast<FileData *>(list->data);
g_string_append(msg, fd->path);
g_string_append(msg, "\n");
{
g_string_append(msg, _("\n Continue multiple file operation?"));
d = file_util_gen_dlg(ud->messages.fail, "dlg_confirm",
- NULL, TRUE,
+ nullptr, TRUE,
file_util_abort_cb, ud);
- generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, NULL, 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, NULL);
+ file_util_warning_dialog(ud->messages.fail, msg->str, GQ_ICON_DIALOG_ERROR, nullptr);
}
g_string_free(msg, TRUE);
}
while (list) /* be careful, file_util_perform_ci_internal can pass ud->flist as list */
{
- FileData *fd = list->data;
+ auto fd = static_cast<FileData *>(list->data);
list = list->next;
if (!EDITOR_ERRORS(flags)) /* files were successfully deleted, call the maint functions */
static gboolean file_util_perform_ci_internal(gpointer data)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(data);
if (!ud->perform_idle_id)
{
/* this is removed when ud is destroyed */
ud->perform_idle_id = g_idle_add(file_util_perform_ci_internal, ud);
- return TRUE;
+ return G_SOURCE_CONTINUE;
}
g_assert(ud->flist);
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);
+ GList *single_entry = g_list_append(nullptr, 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 */
+ if (ud->with_sidecars ? file_data_sc_perform_ci(static_cast<FileData *>(single_entry->data))
+ : file_data_perform_ci(static_cast<FileData *>(single_entry->data)))
+ status = static_cast<EditorFlags>(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_SUSPEND || last) return G_SOURCE_REMOVE;
if (ret == EDITOR_CB_SKIP)
{
- file_util_perform_ci_cb(NULL, EDITOR_ERROR_SKIPPED, ud->flist, ud);
- return FALSE;
+ file_util_perform_ci_cb(nullptr, EDITOR_ERROR_SKIPPED, ud->flist, ud);
+ return G_SOURCE_REMOVE;
}
}
- return TRUE;
+ return G_SOURCE_CONTINUE;
}
static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolean ext_result)
{
case UTILITY_TYPE_DELETE_LINK:
{
- g_assert(ud->dir_fd->sidecar_files == NULL); // directories should not have sidecars
+ g_assert(ud->dir_fd->sidecar_files == nullptr); // directories should not have sidecars
if ((internal && file_data_perform_ci(ud->dir_fd)) ||
(!internal && ext_result))
{
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, NULL);
+ file_util_warning_dialog(ud->messages.fail, text, GQ_ICON_DIALOG_ERROR, nullptr);
g_free(text);
}
file_data_free_ci(ud->dir_fd);
}
case UTILITY_TYPE_DELETE_FOLDER:
{
- FileData *fail = NULL;
+ FileData *fail = nullptr;
GList *work;
work = ud->content_list;
while (work)
{
FileData *fd;
- fd = work->data;
+ fd = static_cast<FileData *>(work->data);
work = work->next;
if (!fail)
if (!fail)
{
- g_assert(ud->dir_fd->sidecar_files == NULL); // directories should not have sidecars
+ g_assert(ud->dir_fd->sidecar_files == nullptr); // directories should not have sidecars
if ((internal && file_data_sc_perform_ci(ud->dir_fd)) ||
(!internal && ext_result))
{
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);
+ gd = file_util_warning_dialog(ud->messages.fail, text, GQ_ICON_DIALOG_ERROR, nullptr);
g_free(text);
if (fail != ud->dir_fd)
}
case UTILITY_TYPE_RENAME_FOLDER:
{
- FileData *fail = NULL;
+ FileData *fail = nullptr;
GList *work;
- g_assert(ud->dir_fd->sidecar_files == NULL); // directories should not have sidecars
+ g_assert(ud->dir_fd->sidecar_files == nullptr); // directories should not have sidecars
if ((internal && file_data_sc_perform_ci(ud->dir_fd)) ||
(!internal && ext_result))
{
FileData *fd;
- fd = work->data;
+ fd = static_cast<FileData *>(work->data);
work = work->next;
if (!fail)
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, NULL);
+ file_util_warning_dialog(ud->messages.fail, text, GQ_ICON_DIALOG_ERROR, nullptr);
g_free(text);
file_data_unref(fail);
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, NULL);
+ file_util_warning_dialog(ud->messages.fail, text, GQ_ICON_DIALOG_ERROR, nullptr);
g_free(text);
}
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)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(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 */
}
break;
case UTILITY_TYPE_FILTER:
case UTILITY_TYPE_EDITOR:
- g_assert(ud->external_command != NULL); /* it should be already set */
+ g_assert(ud->external_command != nullptr); /* it should be already set */
break;
case UTILITY_TYPE_WRITE_METADATA:
- ud->external_command = NULL;
+ ud->external_command = nullptr;
}
if (is_valid_editor_command(ud->external_command))
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);
+ flags = start_editor_from_filelist_full(ud->external_command, ud->flist, nullptr, file_util_perform_ci_cb, ud);
}
else
{
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);
+ file_util_warning_dialog(ud->messages.fail, text, GQ_ICON_DIALOG_ERROR, nullptr);
g_free(text);
- ud->gd = NULL;
+ ud->gd = nullptr;
ud->phase = UTILITY_PHASE_CANCEL;
file_util_dialog_run(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, NULL);
- }
-
- if (!pb_error)
- {
- pb_error = gtk_widget_render_icon(widget, GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_MENU, NULL);
- }
-
- 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, 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)
{
- UtilityData *ud = 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)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(data);
ud->phase = UTILITY_PHASE_START;
file_util_dialog_run(ud);
}
void file_util_check_ci(UtilityData *ud)
{
gint error = CHANGE_OK;
- gchar *desc = NULL;
+ gchar *desc = nullptr;
if (ud->type != UTILITY_TYPE_CREATE_FOLDER &&
ud->type != UTILITY_TYPE_RENAME_FOLDER)
}
else if (ud->dir_fd)
{
- g_assert(ud->dir_fd->sidecar_files == NULL); // directories should not have sidecars
+ g_assert(ud->dir_fd->sidecar_files == nullptr); // directories should not have sidecars
error = file_data_verify_ci(ud->dir_fd, ud->flist);
if (error) desc = file_data_get_error_string(error);
}
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);
}
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);
}
static void file_util_cancel_cb(GenericDialog *gd, gpointer data)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(data);
generic_dialog_close(gd);
- ud->gd = NULL;
+ ud->gd = nullptr;
ud->phase = UTILITY_PHASE_CANCEL;
file_util_dialog_run(ud);
static void file_util_discard_cb(GenericDialog *gd, gpointer data)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(data);
generic_dialog_close(gd);
- ud->gd = NULL;
+ ud->gd = nullptr;
ud->phase = UTILITY_PHASE_DISCARD;
file_util_dialog_run(ud);
static void file_util_ok_cb(GenericDialog *gd, gpointer data)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(data);
generic_dialog_close(gd);
- ud->gd = NULL;
+ ud->gd = nullptr;
file_util_dialog_run(ud);
}
static void file_util_fdlg_cancel_cb(FileDialog *fdlg, gpointer data)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(data);
file_dialog_close(fdlg);
- ud->fdlg = NULL;
+ ud->fdlg = nullptr;
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)));
+ ud->dest_path = g_strdup(gq_gtk_entry_get_text(GTK_ENTRY(ud->fdlg->entry)));
switch (ud->type)
{
static void file_util_fdlg_rename_cb(FileDialog *fdlg, gpointer data)
{
- UtilityData *ud = data;
- gchar *desc = NULL;
- GenericDialog *d = NULL;
+ auto ud = static_cast<UtilityData *>(data);
+ gchar *desc = nullptr;
+ GenericDialog *d = nullptr;
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;
+ ud->fdlg = nullptr;
file_util_dialog_run(ud);
}
else
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;
file_dialog_close(fdlg);
- ud->fdlg = NULL;
+ ud->fdlg = nullptr;
g_free(desc);
}
}
static void file_util_fdlg_ok_cb(FileDialog *fdlg, gpointer data)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(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;
+ ud->fdlg = nullptr;
ud->phase = UTILITY_PHASE_ENTERING;
file_util_dialog_run(ud);
-
- return;
}
-static void file_util_dest_folder_entry_cb(GtkWidget *UNUSED(entry), gpointer data)
+static void file_util_dest_folder_entry_cb(GtkWidget *, gpointer data)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(data);
file_util_dest_folder_update_path(ud);
}
gchar *pad_end;
gint padding;
- if (!format || !name) return NULL;
+ if (!format || !name) return nullptr;
tmp = g_strdup(format);
pad_start = strchr(tmp, '#');
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 */
}
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);
}
-static void file_util_rename_preview_entry_cb(GtkWidget *UNUSED(entry), gpointer data)
+static void file_util_rename_preview_entry_cb(GtkWidget *, gpointer data)
{
- UtilityData *ud = 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)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(data);
file_util_rename_preview_update(ud);
}
static gboolean file_util_rename_idle_cb(gpointer data)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(data);
file_util_rename_preview_update(ud);
ud->update_idle_id = 0;
- return FALSE;
+ 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)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(data);
if (ud->update_idle_id) return;
}
-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)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(data);
GtkTreeIter iter;
- FileData *fd = NULL;
+ FileData *fd = nullptr;
if (path_currently_selected ||
!gtk_tree_model_get_iter(store, &iter, tpath)) return TRUE;
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);
}
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)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(data);
if (ud->details_func && ud->sel_fd)
{
ud->details_func(ud, ud->sel_fd);
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, NULL, file_util_ok_cb, TRUE);
+ generic_dialog_add_button(ud->gd, icon_name, msg, file_util_ok_cb, TRUE);
if (ud->dir_fd)
{
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);
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);
+ gtk_tree_selection_set_select_function(selection, file_util_preview_cb, ud, nullptr);
- generic_dialog_add_image(ud->gd, box, NULL, NULL, FALSE, NULL, NULL, FALSE);
+ generic_dialog_add_image(ud->gd, box, nullptr, nullptr, FALSE, nullptr, nullptr, FALSE);
if (ud->type == UTILITY_TYPE_DELETE ||
ud->type == UTILITY_TYPE_DELETE_LINK ||
{
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,
ud->fdlg = fdlg;
- generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, ud->messages.question, NULL, FALSE);
+ generic_dialog_add_message(GENERIC_DIALOG(fdlg), nullptr, ud->messages.question, nullptr, FALSE);
label = pref_label_new(GENERIC_DIALOG(fdlg)->vbox, _("Choose the destination folder."));
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
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, NULL, ud->dest_path, "move_copy", NULL, NULL);
+ file_dialog_add_path_widgets(fdlg, nullptr, ud->dest_path, "move_copy", nullptr, nullptr);
g_signal_connect(G_OBJECT(fdlg->entry), "changed",
G_CALLBACK(file_util_dest_folder_entry_cb), ud);
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;
ud->gd = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
ud->parent, FALSE, file_util_cancel_cb, ud);
- box = generic_dialog_add_message(ud->gd, NULL, ud->messages.question, NULL, TRUE);
+ 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)
{
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);
-
-
-// column = file_util_rename_multiple_add_column(rd, _("Preview"), RENAME_COLUMN_PREVIEW);
-// gtk_tree_view_column_set_visible(column, FALSE);
+ gtk_tree_selection_set_select_function(selection, file_util_preview_cb, ud, nullptr);
gtk_tree_view_set_reorderable(GTK_TREE_VIEW(ud->listview), TRUE);
if (second_image)
{
- generic_dialog_add_image(ud->gd, box, NULL, "Source", TRUE, NULL, "Destination", TRUE);
+ generic_dialog_add_image(ud->gd, box, nullptr, "Source", TRUE, nullptr, "Destination", TRUE);
}
else
{
- generic_dialog_add_image(ud->gd, box, NULL, NULL, FALSE, NULL, NULL, FALSE);
+ 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);
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, GTK_EXPAND | GTK_FILL, 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);
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);
- ud->auto_spin_start = pref_spin_new(box2, NULL, NULL,
+ ud->auto_spin_start = pref_spin_new(box2, nullptr, nullptr,
0.0, 1000000.0, 1.0, 0, options->cp_mv_rn.auto_start,
G_CALLBACK(file_util_rename_preview_adj_cb), ud);
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:"), NULL,
+ ud->auto_spin_pad = pref_spin_new(page, _("Padding:"), nullptr,
1.0, 8.0, 1.0, 0, options->cp_mv_rn.auto_padding,
G_CALLBACK(file_util_rename_preview_adj_cb), ud);
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);
- ud->format_spin = pref_spin_new(box2, NULL, NULL,
+ ud->format_spin = pref_spin_new(box2, nullptr, nullptr,
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);
}
while (work)
{
- FileData *fd = work->data;
+ auto fd = static_cast<FileData *>(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_warn_op_in_progress(const gchar *title)
{
- file_util_warning_dialog(title, _("Another operation in progress.\n"), GTK_STOCK_DIALOG_ERROR, NULL);
+ 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(data);
+ g_object_unref(GTK_WIDGET(data));
}
static void file_util_details_dialog_destroy_cb(GtkWidget *widget, gpointer data)
{
- UtilityData *ud = data;
+ auto ud = static_cast<UtilityData *>(data);
g_signal_handlers_disconnect_by_func(ud->gd->dialog, (gpointer)(file_util_details_dialog_close_cb), widget);
}
-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 */
}
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");
+ auto ud = static_cast<UtilityData *>(data);
+ auto fd = static_cast<FileData *>(g_object_get_data(G_OBJECT(gd->dialog), "file_data"));
if (!fd) return;
file_util_exclude_fd(ud, fd);
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;
while (work)
{
- FileData *sfd = work->data;
+ auto sfd = static_cast<FileData *>(work->data);
work =work->next;
g_string_append_printf(message, _(" '%s'\n"), sfd->path);
}
{
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);;
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, 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);
+ gd = file_util_gen_dlg(_("File details"), "details", ud->gd->dialog, TRUE, nullptr, ud);
+ 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);
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, NULL, FALSE, NULL, NULL, FALSE);
+ generic_dialog_add_image(gd, box, fd, nullptr, FALSE, nullptr, nullptr, FALSE);
gtk_widget_show(gd->dialog);
GtkWidget *table;
GtkWidget *frame;
GtkWidget *label;
- GList *keys = NULL;
+ GList *keys = nullptr;
GList *work;
gchar *message1;
gchar *message2;
gint i;
- const gchar *stock_id;
+ const gchar *icon_name;
if (fd && fd->modified_xmp)
{
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);
+ gd = file_util_gen_dlg(_("Overview of changed metadata"), "details", ud->gd->dialog, TRUE, nullptr, ud);
+ 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);
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)
{
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);
- frame = pref_frame_new(box, TRUE, NULL, GTK_ORIENTATION_HORIZONTAL, 2);
+ frame = pref_frame_new(box, TRUE, nullptr, GTK_ORIENTATION_HORIZONTAL, 2);
table = pref_table_new(frame, 2, g_list_length(keys), FALSE, TRUE);
work = keys;
i = 0;
while (work)
{
- const gchar *key = work->data;
+ auto key = static_cast<const gchar *>(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);
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);
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);
i++;
}
- generic_dialog_add_image(gd, box, fd, NULL, FALSE, NULL, NULL, FALSE);
+ generic_dialog_add_image(gd, box, fd, nullptr, FALSE, nullptr, nullptr, FALSE);
gtk_widget_set_size_request(gd->dialog, DIALOG_WIDTH, -1);
gtk_widget_show(gd->dialog);
{
while (work)
{
- FileData *fd = work->data;
+ auto fd = static_cast<FileData *>(work->data);
file_data_set_regroup_when_finished(fd, TRUE);
work = work->next;
}
static void file_util_delete_full(FileData *source_fd, GList *flist, GtkWidget *parent, UtilityPhase phase, FileUtilDoneFunc done_func, gpointer done_data)
{
UtilityData *ud;
- GList *ungrouped = NULL;
+ GList *ungrouped = nullptr;
gchar *message;
if (source_fd)
ud->with_sidecars = TRUE;
- ud->dir_fd = NULL;
+ ud->dir_fd = nullptr;
ud->flist = flist;
- ud->content_list = NULL;
+ ud->content_list = nullptr;
ud->parent = parent;
ud->done_data = done_data;
ud->done_func = done_func;
ud->with_sidecars = FALSE; /* operate on individual files, not groups */
- ud->dir_fd = NULL;
+ ud->dir_fd = nullptr;
ud->flist = flist;
- ud->content_list = NULL;
+ ud->content_list = nullptr;
ud->parent = parent;
ud->done_func = done_func;
static void file_util_move_full(FileData *source_fd, GList *flist, const gchar *dest_path, GtkWidget *parent, UtilityPhase phase)
{
UtilityData *ud;
- GList *ungrouped = NULL;
+ GList *ungrouped = nullptr;
if (source_fd)
flist = g_list_append(flist, file_data_ref(source_fd));
ud->with_sidecars = TRUE;
- ud->dir_fd = NULL;
+ ud->dir_fd = nullptr;
ud->flist = flist;
- ud->content_list = NULL;
+ ud->content_list = nullptr;
ud->parent = parent;
ud->details_func = file_util_details_dialog;
static void file_util_copy_full(FileData *source_fd, GList *flist, const gchar *dest_path, GtkWidget *parent, UtilityPhase phase)
{
UtilityData *ud;
- GList *ungrouped = NULL;
+ GList *ungrouped = nullptr;
if (source_fd)
flist = g_list_append(flist, file_data_ref(source_fd));
if (!flist) return;
- if (file_util_write_metadata_first(UTILITY_TYPE_COPY, phase, flist, dest_path, NULL, parent))
+ if (file_util_write_metadata_first(UTILITY_TYPE_COPY, phase, flist, dest_path, nullptr, parent))
return;
flist = file_data_process_groups_in_selection(flist, TRUE, &ungrouped);
ud->with_sidecars = TRUE;
- ud->dir_fd = NULL;
+ ud->dir_fd = nullptr;
ud->flist = flist;
- ud->content_list = NULL;
+ ud->content_list = nullptr;
ud->parent = parent;
ud->details_func = file_util_details_dialog;
static void file_util_rename_full(FileData *source_fd, GList *flist, const gchar *dest_path, GtkWidget *parent, UtilityPhase phase)
{
UtilityData *ud;
- GList *ungrouped = NULL;
+ GList *ungrouped = nullptr;
if (source_fd)
flist = g_list_append(flist, file_data_ref(source_fd));
ud->with_sidecars = TRUE;
- ud->dir_fd = NULL;
+ ud->dir_fd = nullptr;
ud->flist = flist;
- ud->content_list = NULL;
+ ud->content_list = nullptr;
ud->parent = parent;
ud->details_func = file_util_details_dialog;
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;
+ GList *ungrouped = nullptr;
if (editor_no_param(key))
{
- gchar *file_directory = NULL;
+ gchar *file_directory = nullptr;
if (!working_directory)
{
/* working directory was not specified, try to extract it from the files */
file_directory = remove_level_from_path(source_fd->path);
if (!file_directory && flist)
- file_directory = remove_level_from_path(((FileData *)flist->data)->path);
+ file_directory = remove_level_from_path((static_cast<FileData *>(flist->data))->path);
working_directory = file_directory;
}
/* ask for destination if we don't have it */
- if (ud->type == UTILITY_TYPE_FILTER && dest_path == NULL) phase = UTILITY_PHASE_START;
+ if (ud->type == UTILITY_TYPE_FILTER && dest_path == nullptr) phase = UTILITY_PHASE_START;
ud->phase = phase;
ud->external_command = g_strdup(key);
- ud->dir_fd = NULL;
+ ud->dir_fd = nullptr;
ud->flist = flist;
- ud->content_list = NULL;
+ ud->content_list = nullptr;
ud->parent = parent;
ud->details_func = file_util_details_dialog;
static GList *file_util_delete_dir_remaining_folders(GList *dlist)
{
- GList *rlist = NULL;
+ GList *rlist = nullptr;
while (dlist)
{
FileData *fd;
- fd = dlist->data;
+ fd = static_cast<FileData *>(dlist->data);
dlist = dlist->next;
if (!fd->name ||
{
FileData *lfd;
- lfd = work->data;
+ lfd = static_cast<FileData *>(work->data);
work = work->next;
ok = file_util_delete_dir_empty_path(ud, lfd, level);
{
FileData *lfd;
- lfd = work->data;
+ lfd = static_cast<FileData *>(work->data);
work = work->next;
DEBUG_1("deltree child: %s", lfd->path);
{
FileData *fd;
- fd = work->data;
+ fd = static_cast<FileData *>(work->data);
work = work->next;
ok = file_util_delete_dir_empty_path(ud, fd, 0);
{
FileData *fd;
- fd = work->data;
+ fd = static_cast<FileData *>(work->data);
work = work->next;
file_data_sc_free_ci(fd);
}
ud->phase = phase;
ud->with_sidecars = TRUE;
ud->dir_fd = file_data_ref(fd);
- ud->content_list = NULL;
- ud->flist = NULL;
+ ud->content_list = nullptr;
+ ud->flist = nullptr;
ud->parent = parent;
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);
+ file_util_warning_dialog(_("Delete failed"), text, GQ_ICON_DIALOG_ERROR, parent);
g_free(text);
return;
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;
gchar *text;
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);
+ parent, TRUE, nullptr, nullptr);
+ 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."),
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);
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->content_list = nullptr; /* will be filled by file_util_delete_dir_prepare */
ud->flist = flist = filelist_sort_path(flist);
ud->parent = parent;
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);
{
FileData *lfd;
- lfd = work->data;
+ lfd = static_cast<FileData *>(work->data);
work = work->next;
ud->content_list = g_list_prepend(ud->content_list, file_data_ref(lfd));
gchar *np;
FileData *fd;
- fd = work->data;
+ fd = static_cast<FileData *>(work->data);
work = work->next;
g_assert(strncmp(fd->path, ud->dir_fd->path, orig_len) == 0);
{
FileData *fd;
- fd = work->data;
+ fd = static_cast<FileData *>(work->data);
work = work->next;
file_data_sc_free_ci(fd);
}
and the content must be handled including sidecars */
ud->dir_fd = file_data_ref(fd);
- ud->flist = NULL;
- ud->content_list = NULL;
+ ud->flist = nullptr;
+ ud->content_list = nullptr;
ud->parent = parent;
ud->done_func = done_func;
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;
ud->phase = phase;
ud->with_sidecars = TRUE;
- ud->dir_fd = NULL;
- ud->flist = NULL;
- ud->content_list = NULL;
+ ud->dir_fd = nullptr;
+ ud->flist = nullptr;
+ ud->content_list = nullptr;
ud->parent = parent;
if (dest_path)
}
else
{
- gchar *buf = new_folder(GTK_WINDOW(parent), fd->path);
- if (!buf)
- {
- ud->phase = UTILITY_PHASE_CANCEL;
- ud->dir_fd = NULL;
- }
- 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;
file_util_dialog_run(ud);
}
-
static gboolean file_util_write_metadata_first_after_done(gpointer data)
{
- UtilityDelayData *dd = data;
+ auto dd = static_cast<UtilityDelayData *>(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);
+ file_util_start_editor_full(dd->editor_key, nullptr, dd->flist, dd->dest_path, nullptr, dd->parent, dd->phase);
break;
case UTILITY_TYPE_COPY:
- file_util_copy_full(NULL, dd->flist, dd->dest_path, dd->parent, dd->phase);
+ file_util_copy_full(nullptr, 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;
+ 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)
{
- UtilityDelayData *dd = data;
+ auto dd = static_cast<UtilityDelayData *>(data);
if (success)
{
static gboolean file_util_write_metadata_first(UtilityType type, UtilityPhase phase, GList *flist, const gchar *dest_path, const gchar *editor_key, GtkWidget *parent)
{
- GList *unsaved = NULL;
+ GList *unsaved = nullptr;
UtilityDelayData *dd;
GList *work;
work = flist;
while (work)
{
- FileData *fd = work->data;
+ auto fd = static_cast<FileData *>(work->data);
work = work->next;
if (fd->change)
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);
+ file_util_write_metadata(nullptr, unsaved, parent, FALSE, file_util_write_metadata_first_done, dd);
return TRUE;
}
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, NULL, NULL);
+ 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)
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);
+ file_util_rename_full(source_fd, source_list, nullptr, parent, UTILITY_PHASE_START);
}
/* these avoid the location entry dialog unless there is an error, list must be files only and
*/
void file_util_move_simple(GList *list, const gchar *dest_path, GtkWidget *parent)
{
- file_util_move_full(NULL, list, dest_path, parent, UTILITY_PHASE_ENTERING);
+ file_util_move_full(nullptr, list, dest_path, parent, UTILITY_PHASE_ENTERING);
}
void file_util_copy_simple(GList *list, const gchar *dest_path, GtkWidget *parent)
{
- file_util_copy_full(NULL, list, dest_path, parent, UTILITY_PHASE_ENTERING);
+ file_util_copy_full(nullptr, list, dest_path, parent, UTILITY_PHASE_ENTERING);
}
void file_util_rename_simple(FileData *fd, const gchar *dest_path, GtkWidget *parent)
{
- file_util_rename_full(fd, NULL, dest_path, parent, UTILITY_PHASE_ENTERING);
+ file_util_rename_full(fd, nullptr, dest_path, parent, UTILITY_PHASE_ENTERING);
}
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);
+ file_util_start_editor_full(key, fd, nullptr, nullptr, nullptr, parent, UTILITY_PHASE_ENTERING);
}
void file_util_start_editor_from_filelist(const gchar *key, GList *list, const gchar *working_directory, GtkWidget *parent)
{
- file_util_start_editor_full(key, NULL, list, NULL, working_directory, parent, UTILITY_PHASE_ENTERING);
+ 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)
{
- file_util_start_editor_full(key, NULL, list, dest_path, NULL, parent, UTILITY_PHASE_ENTERING);
+ file_util_start_editor_full(key, nullptr, list, dest_path, nullptr, parent, UTILITY_PHASE_ENTERING);
}
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, NULL, 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)
*
*
*/
+#ifdef HAVE_GTK4
static void clipboard_get_func(GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info, gpointer data)
{
- ClipboardData *cbd = static_cast<ClipboardData *>(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);
gchar *file_path;
- gchar *file_path_quoted = NULL;
+ gchar *file_path_quoted = nullptr;
gchar *file_path_uri;
GString *path_list_str;
GList *work;
file_path = static_cast<gchar *>(work->data);
work = work->next;
- file_path_uri = g_filename_to_uri(file_path, NULL, NULL);
+ file_path_uri = g_filename_to_uri(file_path, nullptr, nullptr);
g_string_append(path_list_str, "\n");
g_string_append(path_list_str, file_path_uri);
g_free(file_path_uri);
}
}
- 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
*
*
*/
-static void clipboard_clear_func(GtkClipboard *UNUSED(clipboard), gpointer data)
+static void clipboard_clear_func(GtkClipboard *, gpointer data)
{
- ClipboardData *cbd = static_cast<ClipboardData *>(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);
}
if (options->clipboard_selection == CLIPBOARD_PRIMARY || options->clipboard_selection == CLIPBOARD_BOTH)
{
cbd = g_new0(ClipboardData, 1);
- cbd->path_list = NULL;
+ cbd->path_list = nullptr;
cbd->quoted = quoted;
cbd->path_list = g_list_append(cbd->path_list, g_strdup(fd->path));
if (options->clipboard_selection == CLIPBOARD_CLIPBOARD || options->clipboard_selection == CLIPBOARD_BOTH)
{
cbd = g_new0(ClipboardData, 1);
- cbd->path_list = NULL;
+ cbd->path_list = nullptr;
cbd->quoted = quoted;
cbd->path_list = g_list_append(cbd->path_list, g_strdup(fd->path));
if (options->clipboard_selection == CLIPBOARD_PRIMARY || options->clipboard_selection == CLIPBOARD_BOTH)
{
cbd = g_new0(ClipboardData, 1);
- cbd->path_list = NULL;
+ cbd->path_list = nullptr;
cbd->quoted = quoted;
work = fd_list;
if (options->clipboard_selection == CLIPBOARD_CLIPBOARD || options->clipboard_selection == CLIPBOARD_BOTH)
{
cbd = g_new0(ClipboardData, 1);
- cbd->path_list = NULL;
+ cbd->path_list = nullptr;
cbd->quoted = quoted;
work = fd_list;
filelist_free(fd_list);
}
-static void new_folder_entry_activate_cb(GtkWidget *UNUSED(widget), gpointer data)
-{
- GtkDialog *dialog = 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 = NULL;
- gchar *window_title;
- PangoLayout *layout;
- gint width, height;
-
- buf = g_build_filename(path, _("New folder"), NULL);
- folder_path = unique_filename(buf, NULL, " ", 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 = NULL;
- 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: */
projects / geeqie.git / blobdiff