if (second_image)
{
- preview_box = pref_box_new(box, TRUE, GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
+ preview_box = pref_box_new(box, FALSE, GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
}
/* image 1 */
{
GtkWidget *sep;
- gtk_box_pack_start(GTK_BOX(preview_box), vbox, TRUE, TRUE, 0);
+ 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);
}
else
{
- gtk_box_pack_start(GTK_BOX(box), vbox, TRUE, TRUE, PREF_PAD_GAP);
+ gtk_box_pack_start(GTK_BOX(box), vbox, FALSE, TRUE, PREF_PAD_GAP);
}
gtk_widget_show(vbox);
head = pref_label_new(vbox, header1);
pref_label_bold(head, TRUE, FALSE);
+#if GTK_CHECK_VERSION(3,16,0)
+ gtk_label_set_xalign(GTK_LABEL(head), 0.0);
+ gtk_label_set_yalign(GTK_LABEL(head), 0.5);
+#else
gtk_misc_set_alignment(GTK_MISC(head), 0.0, 0.5);
+#endif
}
imd = image_new(FALSE);
head = pref_label_new(vbox, header2);
pref_label_bold(head, TRUE, FALSE);
+#if GTK_CHECK_VERSION(3,16,0)
+ gtk_label_set_xalign(GTK_LABEL(head), 0.0);
+ gtk_label_set_yalign(GTK_LABEL(head), 0.5);
+#else
gtk_misc_set_alignment(GTK_MISC(head), 0.0, 0.5);
+#endif
}
imd = image_new(FALSE);
GenericDialog *gd;
gd = file_util_gen_dlg(heading, "warning", parent, TRUE, NULL, NULL);
- generic_dialog_add_message(gd, icon_stock_id, heading, message);
+ 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);
if (options->place_dialogs_under_mouse)
{
NULL, TRUE,
file_util_abort_cb, ud);
- generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, NULL, msg->str);
+ generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, NULL, msg->str, TRUE);
generic_dialog_add_button(d, GTK_STOCK_GO_FORWARD, _("Co_ntinue"),
file_util_resume_cb, TRUE);
gchar *text = g_strdup_printf(_("%s\nUnable to start external command.\n"), editor_get_error_str(flags));
file_util_warning_dialog(ud->messages.fail, text, GTK_STOCK_DIALOG_ERROR, NULL);
g_free(text);
+
+ ud->gd = NULL;
+ ud->phase = UTILITY_PHASE_CANCEL;
+ file_util_dialog_run(ud);
}
}
else
error = file_data_verify_ci_list(ud->flist, &desc, ud->with_sidecars);
}
}
+ else
+ {
+ if (ud->type == UTILITY_TYPE_CREATE_FOLDER || ud->type == UTILITY_TYPE_RENAME_FOLDER)
+ {
+ if (isdir(ud->dest_path) || isfile(ud->dest_path))
+ {
+ error = CHANGE_DEST_EXISTS;
+ desc = g_strdup_printf(_("%s already exists"), ud->dest_path);
+ }
+ }
+ }
if (!error)
{
ud->parent, TRUE,
file_util_check_abort_cb, ud);
- generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("Really continue?"), desc);
+ generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("Really continue?"), desc, TRUE);
generic_dialog_add_button(d, GTK_STOCK_GO_FORWARD, _("Co_ntinue"),
file_util_check_resume_cb, TRUE);
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);
+ generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("This operation can't continue:"), desc, TRUE);
gtk_widget_show(d->dialog);
}
{
case UTILITY_TYPE_COPY:
file_data_sc_update_ci_copy_list(ud->flist, ud->dest_path);
+ break;
case UTILITY_TYPE_MOVE:
file_data_sc_update_ci_move_list(ud->flist, ud->dest_path);
break;
}
}
-static void file_util_fdlg_ok_cb(FileDialog *fdlg, gpointer data)
+static void file_util_fdlg_rename_cb(FileDialog *fdlg, gpointer data)
{
UtilityData *ud = data;
gchar *desc = NULL;
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);
+ generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("This operation can't continue:"), desc, TRUE);
gtk_widget_show(d->dialog);
ud->phase = UTILITY_PHASE_START;
}
}
+static void file_util_fdlg_ok_cb(FileDialog *fdlg, gpointer data)
+{
+ UtilityData *ud = data;
+
+ file_util_dest_folder_update_path(ud);
+ if (isdir(ud->dest_path)) file_dialog_sync_history(fdlg, TRUE);
+ file_dialog_close(fdlg);
+
+ ud->fdlg = NULL;
+ ud->phase = UTILITY_PHASE_ENTERING;
+
+ file_util_dialog_run(ud);
+
+ return;
+}
static void file_util_dest_folder_entry_cb(GtkWidget *entry, gpointer data)
{
label = pref_label_new(gd->vbox, buf);
g_free(buf);
+#if GTK_CHECK_VERSION(3,16,0)
+ gtk_label_set_xalign(GTK_LABEL(label), 1.0);
+ gtk_label_set_yalign(GTK_LABEL(label), 0.5);
+#else
gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
+#endif
gtk_widget_set_sensitive(label, FALSE);
}
const gchar *stock_id;
- /* FIXME: use ud->stock_id */
+ /** @FIXME use ud->stock_id */
if (ud->type == UTILITY_TYPE_DELETE ||
ud->type == UTILITY_TYPE_DELETE_LINK ||
ud->type == UTILITY_TYPE_DELETE_FOLDER)
box = generic_dialog_add_message(ud->gd, GTK_STOCK_DIALOG_QUESTION,
ud->messages.question,
- dir_msg);
+ dir_msg, TRUE);
g_free(dir_msg);
ud->fdlg = fdlg;
- generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, ud->messages.question, NULL);
+ generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, ud->messages.question, NULL, FALSE);
label = pref_label_new(GENERIC_DIALOG(fdlg)->vbox, _("Choose the destination folder."));
+#if GTK_CHECK_VERSION(3,16,0)
+ gtk_label_set_xalign(GTK_LABEL(label), 0.0);
+ gtk_label_set_yalign(GTK_LABEL(label), 0.5);
+#else
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+#endif
pref_spacer(GENERIC_DIALOG(fdlg)->vbox, 0);
- file_dialog_add_button(fdlg, stock_id, ud->messages.title, file_util_fdlg_ok_cb, TRUE);
+ if (options->with_rename)
+ {
+ 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);
+ }
+ 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_path_widgets(fdlg, NULL, ud->dest_path, "move_copy", NULL, NULL);
GtkWidget *table;
GtkWidget *combo;
GtkWidget *page;
+ gchar *destination_message;
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);
+ box = generic_dialog_add_message(ud->gd, NULL, ud->messages.question, NULL, 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);
generic_dialog_add_button(ud->gd, GTK_STOCK_OK, ud->messages.title, file_util_ok_cb, TRUE);
- box = pref_group_new(box, TRUE, ud->messages.desc_flist, GTK_ORIENTATION_HORIZONTAL);
+ if (ud->type == UTILITY_TYPE_COPY || ud->type == UTILITY_TYPE_MOVE)
+ {
+ destination_message = g_strconcat(ud->messages.desc_flist," to: ", ud->dest_path, NULL);
+ }
+ else
+ {
+ destination_message = g_strdup(ud->messages.desc_flist);
+ }
+
+ box = pref_group_new(box, TRUE, destination_message, GTK_ORIENTATION_HORIZONTAL);
+ g_free(destination_message);
ud->listview = file_util_dialog_add_list(box, ud->flist, FALSE, ud->with_sidecars);
file_util_dialog_add_list_column(ud->listview, _("Sidecars"), FALSE, UTILITY_COLUMN_SIDECARS);
ud->phase = UTILITY_PHASE_ENTERING;
break;
case UTILITY_TYPE_RENAME_FOLDER:
- ud->phase = UTILITY_PHASE_CANCEL; /* FIXME - not handled for now */
+ ud->phase = UTILITY_PHASE_CANCEL; /**< @FIXME not handled for now */
file_util_dialog_run(ud);
return;
}
case UTILITY_PHASE_ENTERING:
file_util_check_ci(ud);
break;
-
- ud->phase = UTILITY_PHASE_CHECKED;
case UTILITY_PHASE_CHECKED:
file_util_perform_ci(ud);
break;
message = file_util_details_get_message(ud, fd, &stock_id);
- box = generic_dialog_add_message(gd, stock_id, _("File details"), message);
+ box = generic_dialog_add_message(gd, stock_id, _("File details"), message, TRUE);
generic_dialog_add_image(gd, box, fd, NULL, FALSE, NULL, NULL, FALSE);
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);
+ box = generic_dialog_add_message(gd, stock_id, _("Overview of changed metadata"), message1, TRUE);
box = pref_group_new(box, TRUE, message2, GTK_ORIENTATION_HORIZONTAL);
label = gtk_label_new(title_f);
+#if GTK_CHECK_VERSION(3,16,0)
+ gtk_label_set_xalign(GTK_LABEL(label), 1.0);
+ gtk_label_set_yalign(GTK_LABEL(label), 0.0);
+#else
gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.0);
+#endif
pref_label_bold(label, TRUE, FALSE);
gtk_table_attach(GTK_TABLE(table), label,
0, 1, i, i + 1,
label = gtk_label_new(value);
+#if GTK_CHECK_VERSION(3,16,0)
+ gtk_label_set_xalign(GTK_LABEL(label), 0.0);
+ gtk_label_set_yalign(GTK_LABEL(label), 0.0);
+#else
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
+#endif
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_table_attach(GTK_TABLE(table), label,
1, 2, i, i + 1,
}
}
-
-static void file_util_delete_full(FileData *source_fd, GList *flist, GtkWidget *parent, UtilityPhase phase)
+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;
+ gchar *message;
if (source_fd)
flist = g_list_append(flist, file_data_ref(source_fd));
ud->flist = flist;
ud->content_list = NULL;
ud->parent = parent;
+ ud->done_data = done_data;
+ ud->done_func = done_func;
ud->details_func = file_util_details_dialog;
-
+ if(options->file_ops.safe_delete_enable)
+ {
+ message = _("This will move the following files to the Trash bin");
+ }
+ else
+ {
+ message = _("This will permanently delete the following files");
+ }
ud->messages.title = _("Delete");
ud->messages.question = _("Delete files?");
- ud->messages.desc_flist = _("This will delete the following files");
+ ud->messages.desc_flist = message;
ud->messages.desc_source_fd = "";
ud->messages.fail = _("File deletion failed");
fd->path);
box = generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING,
_("Folder contains subfolders"),
- text);
+ text, TRUE);
g_free(text);
box = pref_group_new(box, TRUE, _("Subfolders:"), GTK_ORIENTATION_VERTICAL);
if (dest_path)
{
+ g_assert_not_reached(); // not used in current design
ud->dest_path = g_strdup(dest_path);
}
else
{
- gchar *buf = g_build_filename(fd->path, _("New folder"), NULL);
- ud->dest_path = unique_filename(buf, NULL, " ", FALSE);
- g_free(buf);
+ 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);
+ }
}
- ud->dir_fd = file_data_new_dir(ud->dest_path);
-
ud->done_func = done_func;
ud->done_data = done_data;
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);
+ file_util_delete_full(source_fd, source_list, parent, options->file_ops.confirm_delete ? UTILITY_PHASE_START : UTILITY_PHASE_ENTERING, NULL, NULL);
+}
+
+void file_util_delete_notify_done(FileData *source_fd, GList *source_list, GtkWidget *parent, FileUtilDoneFunc done_func, gpointer done_data)
+{
+ file_util_delete_full(source_fd, source_list, parent, options->file_ops.confirm_delete ? UTILITY_PHASE_START : UTILITY_PHASE_ENTERING, done_func, done_data);
}
void file_util_write_metadata(FileData *source_fd, GList *source_list, GtkWidget *parent, gboolean force_dialog, FileUtilDoneFunc done_func, gpointer done_data)
}
-void file_util_copy_path_to_clipboard(FileData *fd)
+void file_util_copy_path_to_clipboard(FileData *fd, gboolean quoted)
{
- GtkClipboard *clipboard;
-
if (!fd || !*fd->path) return;
- clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
- gtk_clipboard_set_text(clipboard, g_shell_quote(fd->path), -1);
+ if (options->clipboard_selection == CLIPBOARD_PRIMARY)
+ {
+ gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), quoted ? g_shell_quote(fd->path) : fd->path , -1);
+ }
+ else if (options->clipboard_selection == CLIPBOARD_CLIPBOARD)
+ {
+ gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), quoted ? g_shell_quote(fd->path) : fd->path , -1);
+ }
+ else
+ {
+ gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), quoted ? g_shell_quote(fd->path) : fd->path , -1);
+ gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), quoted ? g_shell_quote(fd->path) : fd->path , -1);
+ }
}
-void file_util_copy_path_list_to_clipboard(GList *list)
+void file_util_copy_path_list_to_clipboard(GList *list, gboolean quoted)
{
- GtkClipboard *clipboard;
GList *work;
GString *new;
- clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
-
new = g_string_new("");
work = list;
while (work) {
if (!fd || !*fd->path) continue;
- g_string_append(new, g_shell_quote(fd->path));
+ if (quoted)
+ {
+ g_string_append(new, g_shell_quote(fd->path));
+ }
+ else
+ {
+ g_string_append(new, fd->path);
+ }
if (work) g_string_append_c(new, ' ');
}
- gtk_clipboard_set_text(clipboard, new->str, new->len);
+ if (options->clipboard_selection == CLIPBOARD_PRIMARY)
+ {
+ gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), new->str, new->len);
+ }
+ else if (options->clipboard_selection == CLIPBOARD_CLIPBOARD)
+ {
+ gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), new->str, new->len);
+ }
+ else
+ {
+ gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), new->str, new->len);
+ gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), new->str, new->len);
+ }
+
g_string_free(new, TRUE);
filelist_free(list);
}
+
+static void new_folder_entry_activate_cb(GtkWidget *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_vbox_new(FALSE, PREF_PAD_GAP);
+ gtk_box_pack_start(GTK_BOX(content_area), vbox, FALSE, FALSE, 0);
+
+ hbox = gtk_hbox_new(FALSE, 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