Skip to content

Fix destination icon in file conflict dialog #2656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lenemter merged 10 commits into from
Nov 7, 2025
Merged

Fix destination icon in file conflict dialog #2656

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f3fbc64
Revert "Separate afc fix; use for abstractmountable"
jeremypw Oct 30, 2025
671506b
Make source and destination construct properties
jeremypw Oct 30, 2025
d6cc37b
Make dest_dir a construct property
jeremypw Oct 30, 2025
f156b37
Move thumbnailer into file_list_ready_cb
jeremypw Oct 30, 2025
7caedc6
Get destination image the same way as source image, in file ready cal…
jeremypw Oct 30, 2025
fa57b7d
Merge branch 'main' into jeremypw/fix-icon-in-replace-dialog
jeremypw Oct 31, 2025
bc18f66
Merge branch 'main' into jeremypw/fix-icon-in-replace-dialog
jeremypw Nov 2, 2025
843d7a0
Apply suggestion from @lenemter
jeremypw Nov 7, 2025
bc0dab1
Make properties private get
jeremypw Nov 7, 2025
fe3e818
Merge branch 'main' into jeremypw/fix-icon-in-replace-dialog
jeremypw Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 20 additions & 26 deletions libcore/FileConflictDialog.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ public class Files.FileConflictDialog : Granite.MessageDialog {
NEWEST
}

public Files.File source { private get; construct; }
public Files.File destination { private get; construct; }
public Files.File dest_dir { private get; construct; }

private string conflict_name;
private Gtk.Entry rename_entry;
private Gtk.Button replace_button;
private Gtk.Button keep_newest_button;
private Gtk.CheckButton apply_all_checkbutton;

private Files.File source;
private Files.File destination;
private Files.File dest_dir;

private Gtk.Image source_image;
private Gtk.Label source_size_label;
private Gtk.Label source_type_label;
Expand All @@ -58,32 +58,13 @@ public class Files.FileConflictDialog : Granite.MessageDialog {

public FileConflictDialog (Gtk.Window parent, GLib.File _source, GLib.File _destination, GLib.File _dest_dir) {
Object (
source: Files.File.@get (_source),
destination: Files.File.@get (_destination),
dest_dir: Files.File.@get (_dest_dir),
title: _("File conflict"),
transient_for: parent,
resizable: false
);

source = Files.File.@get (_source);
destination = Files.File.@get (_destination);
destination.query_update ();
var thumbnailer = Files.Thumbnailer.get ();
thumbnailer.finished.connect (() => {
destination_image.gicon = destination.get_icon_pixbuf (64, get_scale_factor (),
Files.File.IconFlags.USE_THUMBNAILS);
});

thumbnailer.queue_file (destination, null);
destination_size_label.label = destination.format_size;
destination_time_label.label = destination.formated_modified;

dest_dir = Files.File.@get (_dest_dir);

var files = new GLib.List<Files.File> ();
files.prepend (source);
files.prepend (destination);
files.prepend (dest_dir);

new Files.CallWhenReady (files, file_list_ready_cb);
}

construct {
Expand Down Expand Up @@ -268,6 +249,13 @@ public class Files.FileConflictDialog : Granite.MessageDialog {
replace_button.show ();
}
});

var files = new GLib.List<Files.File> ();
files.prepend (source);
files.prepend (destination);
files.prepend (dest_dir);

new Files.CallWhenReady (files, file_list_ready_cb);
}

private void file_list_ready_cb (GLib.List<Files.File> files) {
Expand Down Expand Up @@ -318,9 +306,15 @@ public class Files.FileConflictDialog : Granite.MessageDialog {
}

secondary_label.label = "%s %s".printf (message, message_extra);

source_image.gicon = source.get_icon_pixbuf (64, get_scale_factor (), Files.File.IconFlags.USE_THUMBNAILS);
source_size_label.label = source.format_size;
source_time_label.label = source.formated_modified;

destination_image.gicon = destination.get_icon_pixbuf (64, get_scale_factor (), Files.File.IconFlags.USE_THUMBNAILS);
destination_size_label.label = destination.format_size;
destination_time_label.label = destination.formated_modified;

if (should_show_type && src_ftype != null) {
source_type_label.label = src_ftype;
} else {
Expand Down