summaryrefslogtreecommitdiff
path: root/src/AppWindow.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-12-17 19:58:25 +0100
committerJörg Frings-Fürst <debian@jff.email>2023-12-17 19:58:25 +0100
commit4cb46f4de4b881e5b1f65af017dca6f3917e55e5 (patch)
treefb359e210d2d9c30f5ad36a447ea29b62ae9bb56 /src/AppWindow.vala
parent841f952294b349b2b8e2afb5305ce34a3b59bb4b (diff)
parentf5a0cee8ccecc7b6c6c2d8e9fb6f6eecd53531fe (diff)
Update upstream source from tag 'upstream/0.32.4'
Update to upstream version '0.32.4' with Debian dir 51798a6af1c9b7e48f979c020d72f3c5ddd964a6
Diffstat (limited to 'src/AppWindow.vala')
-rw-r--r--src/AppWindow.vala11
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();