Mercurial > hg > forks > geeqie

comparison src/utilops.c @ 2587:c6f9494f6be1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix #508: Copy and Move windows scale incorrectly https://github.com/BestImageViewer/geeqie/issues/508
author cclark <colin.clark@cclark.uk>
date Wed, 06 Sep 2017 11:59:47 +0100
parents 130acea2daa0
children 669eeafa5d11
comparison
equal deleted inserted replaced
2586:e2c53828af57 2587:c6f9494f6be1
200 const gchar *icon_stock_id, GtkWidget *parent) 200 const gchar *icon_stock_id, GtkWidget *parent)
201 { 201 {
202 GenericDialog *gd; 202 GenericDialog *gd;
203 203
204 gd = file_util_gen_dlg(heading, "warning", parent, TRUE, NULL, NULL); 204 gd = file_util_gen_dlg(heading, "warning", parent, TRUE, NULL, NULL);
205 generic_dialog_add_message(gd, icon_stock_id, heading, message); 205 generic_dialog_add_message(gd, icon_stock_id, heading, message, TRUE);
206 generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, file_util_warning_dialog_ok_cb, TRUE); 206 generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, file_util_warning_dialog_ok_cb, TRUE);
207 if (options->place_dialogs_under_mouse) 207 if (options->place_dialogs_under_mouse)
208 { 208 {
209 gtk_window_set_position(GTK_WINDOW(gd->dialog), GTK_WIN_POS_MOUSE); 209 gtk_window_set_position(GTK_WINDOW(gd->dialog), GTK_WIN_POS_MOUSE);
210 } 210 }
590 g_string_append(msg, _("\n Continue multiple file operation?")); 590 g_string_append(msg, _("\n Continue multiple file operation?"));
591 d = file_util_gen_dlg(ud->messages.fail, "dlg_confirm", 591 d = file_util_gen_dlg(ud->messages.fail, "dlg_confirm",
592 NULL, TRUE, 592 NULL, TRUE,
593 file_util_abort_cb, ud); 593 file_util_abort_cb, ud);
594 594
595 generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, NULL, msg->str); 595 generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, NULL, msg->str, TRUE);
596 596
597 generic_dialog_add_button(d, GTK_STOCK_GO_FORWARD, _("Co_ntinue"), 597 generic_dialog_add_button(d, GTK_STOCK_GO_FORWARD, _("Co_ntinue"),
598 file_util_resume_cb, TRUE); 598 file_util_resume_cb, TRUE);
599 gtk_widget_show(d->dialog); 599 gtk_widget_show(d->dialog);
600 ret = EDITOR_CB_SUSPEND; 600 ret = EDITOR_CB_SUSPEND;
1023 1023
1024 d = file_util_gen_dlg(ud->messages.title, "dlg_confirm", 1024 d = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
1025 ud->parent, TRUE, 1025 ud->parent, TRUE,
1026 file_util_check_abort_cb, ud); 1026 file_util_check_abort_cb, ud);
1027 1027
1028 generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("Really continue?"), desc); 1028 generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("Really continue?"), desc, TRUE);
1029 1029
1030 generic_dialog_add_button(d, GTK_STOCK_GO_FORWARD, _("Co_ntinue"), 1030 generic_dialog_add_button(d, GTK_STOCK_GO_FORWARD, _("Co_ntinue"),
1031 file_util_check_resume_cb, TRUE); 1031 file_util_check_resume_cb, TRUE);
1032 gtk_widget_show(d->dialog); 1032 gtk_widget_show(d->dialog);
1033 } 1033 }
1037 GenericDialog *d; 1037 GenericDialog *d;
1038 1038
1039 d = file_util_gen_dlg(ud->messages.title, "dlg_confirm", 1039 d = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
1040 ud->parent, TRUE, 1040 ud->parent, TRUE,
1041 file_util_check_abort_cb, ud); 1041 file_util_check_abort_cb, ud);
1042 generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("This operation can't continue:"), desc); 1042 generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("This operation can't continue:"), desc, TRUE);
1043 1043
1044 gtk_widget_show(d->dialog); 1044 gtk_widget_show(d->dialog);
1045 } 1045 }
1046 g_free(desc); 1046 g_free(desc);
1047 } 1047 }
1150 desc = g_strdup_printf(_("%s is not a directory"), ud->dest_path); 1150 desc = g_strdup_printf(_("%s is not a directory"), ud->dest_path);
1151 1151
1152 d = file_util_gen_dlg(ud->messages.title, "dlg_confirm", 1152 d = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
1153 ud->parent, TRUE, 1153 ud->parent, TRUE,
1154 file_util_check_abort_cb, ud); 1154 file_util_check_abort_cb, ud);
1155 generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("This operation can't continue:"), desc); 1155 generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("This operation can't continue:"), desc, TRUE);
1156 1156
1157 gtk_widget_show(d->dialog); 1157 gtk_widget_show(d->dialog);
1158 ud->phase = UTILITY_PHASE_START; 1158 ud->phase = UTILITY_PHASE_START;
1159 1159
1160 file_dialog_close(fdlg); 1160 file_dialog_close(fdlg);
1509 dir_msg = g_strdup(""); 1509 dir_msg = g_strdup("");
1510 } 1510 }
1511 1511
1512 box = generic_dialog_add_message(ud->gd, GTK_STOCK_DIALOG_QUESTION, 1512 box = generic_dialog_add_message(ud->gd, GTK_STOCK_DIALOG_QUESTION,
1513 ud->messages.question, 1513 ud->messages.question,
1514 dir_msg); 1514 dir_msg, TRUE);
1515 1515
1516 g_free(dir_msg); 1516 g_free(dir_msg);
1517 1517
1518 box = pref_group_new(box, TRUE, ud->messages.desc_flist, GTK_ORIENTATION_HORIZONTAL); 1518 box = pref_group_new(box, TRUE, ud->messages.desc_flist, GTK_ORIENTATION_HORIZONTAL);
1519 1519
1556 fdlg = file_util_file_dlg(ud->messages.title, "dlg_dest_folder", ud->parent, 1556 fdlg = file_util_file_dlg(ud->messages.title, "dlg_dest_folder", ud->parent,
1557 file_util_fdlg_cancel_cb, ud); 1557 file_util_fdlg_cancel_cb, ud);
1558 1558
1559 ud->fdlg = fdlg; 1559 ud->fdlg = fdlg;
1560 1560
1561 generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, ud->messages.question, NULL); 1561 generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, ud->messages.question, NULL, FALSE);
1562 1562
1563 label = pref_label_new(GENERIC_DIALOG(fdlg)->vbox, _("Choose the destination folder.")); 1563 label = pref_label_new(GENERIC_DIALOG(fdlg)->vbox, _("Choose the destination folder."));
1564 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); 1564 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
1565 pref_spacer(GENERIC_DIALOG(fdlg)->vbox, 0); 1565 pref_spacer(GENERIC_DIALOG(fdlg)->vbox, 0);
1566 1566
1604 GtkWidget *page; 1604 GtkWidget *page;
1605 1605
1606 ud->gd = file_util_gen_dlg(ud->messages.title, "dlg_confirm", 1606 ud->gd = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
1607 ud->parent, FALSE, file_util_cancel_cb, ud); 1607 ud->parent, FALSE, file_util_cancel_cb, ud);
1608 1608
1609 box = generic_dialog_add_message(ud->gd, NULL, ud->messages.question, NULL); 1609 box = generic_dialog_add_message(ud->gd, NULL, ud->messages.question, NULL, TRUE);
1610 1610
1611 if (ud->discard_func) generic_dialog_add_button(ud->gd, GTK_STOCK_REVERT_TO_SAVED, _("Discard changes"), file_util_discard_cb, FALSE); 1611 if (ud->discard_func) generic_dialog_add_button(ud->gd, GTK_STOCK_REVERT_TO_SAVED, _("Discard changes"), file_util_discard_cb, FALSE);
1612 if (ud->details_func) generic_dialog_add_button(ud->gd, GTK_STOCK_INFO, _("File details"), file_util_details_cb, FALSE); 1612 if (ud->details_func) generic_dialog_add_button(ud->gd, GTK_STOCK_INFO, _("File details"), file_util_details_cb, FALSE);
1613 1613
1614 generic_dialog_add_button(ud->gd, GTK_STOCK_OK, ud->messages.title, file_util_ok_cb, TRUE); 1614 generic_dialog_add_button(ud->gd, GTK_STOCK_OK, ud->messages.title, file_util_ok_cb, TRUE);
1979 G_CALLBACK(file_util_details_dialog_close_cb), gd->dialog); 1979 G_CALLBACK(file_util_details_dialog_close_cb), gd->dialog);
1980 1980
1981 1981
1982 message = file_util_details_get_message(ud, fd, &stock_id); 1982 message = file_util_details_get_message(ud, fd, &stock_id);
1983 1983
1984 box = generic_dialog_add_message(gd, stock_id, _("File details"), message); 1984 box = generic_dialog_add_message(gd, stock_id, _("File details"), message, TRUE);
1985 1985
1986 generic_dialog_add_image(gd, box, fd, NULL, FALSE, NULL, NULL, FALSE); 1986 generic_dialog_add_image(gd, box, fd, NULL, FALSE, NULL, NULL, FALSE);
1987 1987
1988 gtk_widget_show(gd->dialog); 1988 gtk_widget_show(gd->dialog);
1989 1989
2035 else 2035 else
2036 { 2036 {
2037 message2 = g_strdup_printf(_("The following metadata tags will be written to the image file itself.")); 2037 message2 = g_strdup_printf(_("The following metadata tags will be written to the image file itself."));
2038 } 2038 }
2039 2039
2040 box = generic_dialog_add_message(gd, stock_id, _("Overview of changed metadata"), message1); 2040 box = generic_dialog_add_message(gd, stock_id, _("Overview of changed metadata"), message1, TRUE);
2041 2041
2042 box = pref_group_new(box, TRUE, message2, GTK_ORIENTATION_HORIZONTAL); 2042 box = pref_group_new(box, TRUE, message2, GTK_ORIENTATION_HORIZONTAL);
2043 2043
2044 frame = pref_frame_new(box, TRUE, NULL, GTK_ORIENTATION_HORIZONTAL, 2); 2044 frame = pref_frame_new(box, TRUE, NULL, GTK_ORIENTATION_HORIZONTAL, 2);
2045 table = pref_table_new(frame, 2, g_list_length(keys), FALSE, TRUE); 2045 table = pref_table_new(frame, 2, g_list_length(keys), FALSE, TRUE);
2635 text = g_strdup_printf(_("Unable to delete the folder:\n\n%s\n\n" 2635 text = g_strdup_printf(_("Unable to delete the folder:\n\n%s\n\n"
2636 "This folder contains subfolders which must be moved before it can be deleted."), 2636 "This folder contains subfolders which must be moved before it can be deleted."),
2637 fd->path); 2637 fd->path);
2638 box = generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING, 2638 box = generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING,
2639 _("Folder contains subfolders"), 2639 _("Folder contains subfolders"),
2640 text); 2640 text, TRUE);
2641 g_free(text); 2641 g_free(text);
2642 2642
2643 box = pref_group_new(box, TRUE, _("Subfolders:"), GTK_ORIENTATION_VERTICAL); 2643 box = pref_group_new(box, TRUE, _("Subfolders:"), GTK_ORIENTATION_VERTICAL);
2644 2644
2645 rlist = filelist_sort_path(rlist); 2645 rlist = filelist_sort_path(rlist);