diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2023-12-29 18:43:43 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2023-12-29 18:43:43 +0100 |
| commit | 14bc7db2e07c5d1ccfb4d723c9dba395e6c93171 (patch) | |
| tree | 7b00861348dedd18d3651537128bbe783dab364c /src/AppWindow.vala | |
| parent | 1bf62485f701b52ae27433e3570ac24cd7da886f (diff) | |
| parent | 67d142325abb0d9345baef77f00a047a7dc1eca3 (diff) | |
Merge branch 'release/debian/0.32.4-1'HEADdebian/0.32.4-1master
Diffstat (limited to 'src/AppWindow.vala')
| -rw-r--r-- | src/AppWindow.vala | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/AppWindow.vala b/src/AppWindow.vala index 1fb0515..7398c74 100644 --- a/src/AppWindow.vala +++ b/src/AppWindow.vala @@ -546,14 +546,21 @@ public abstract class AppWindow : PageWindow { } public static int export_overwrite_or_replace_question(string message, - string alt1, string alt2, string alt3, string alt4, string alt5, string alt6, + string alt1, string alt2, string alt4, string alt6, string? title = null, Gtk.Window? parent = null) { Gtk.MessageDialog dialog = new Gtk.MessageDialog((parent != null) ? parent : get_instance(), Gtk.DialogFlags.MODAL, Gtk.MessageType.QUESTION, Gtk.ButtonsType.NONE, "%s", message); dialog.title = (title != null) ? title : Resources.APP_TITLE; - dialog.add_buttons(alt1, 1, alt2, 2, alt3, 3, alt4, 4, alt5, 5, alt6, 6); + var content = (Gtk.Box)dialog.get_message_area(); + var c = new Gtk.CheckButton.with_label("Apply conflict resolution to all other conflicts"); + c.show(); + content.pack_end(c); + dialog.add_buttons(alt1, 1, alt2, 2, alt4, 4, alt6, 6); int response = dialog.run(); + if (c.get_active()) { + response |= 0x80; + } dialog.destroy(); |