Skip to content

Wallpaper: DRY add_wallpaper_from_file #474

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
danirabbit merged 3 commits into from
Jan 16, 2026
Merged

Wallpaper: DRY add_wallpaper_from_file #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84d661d
Wallpaper: DRY add_wallpaper_from_file
danirabbit Jan 14, 2026
121e3f2
merge main
danirabbit Jan 14, 2026
75a8458
Merge branch 'main' into danirabbit/wallpaper-dryadd
danirabbit Jan 16, 2026
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
5 changes: 3 additions & 2 deletions src/IOHelper.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@
*/
public class PantheonShell.IOHelper : GLib.Object {
private const string[] ACCEPTED_TYPES = {
"image/gif",
"image/heic",
"image/jpeg",
"image/png",
"image/tiff",
"image/svg+xml",
"image/gif"
"image/tiff"
};

// Check if the filename has a picture file extension.
Expand Down
71 changes: 37 additions & 34 deletions src/Views/Wallpaper.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,7 @@ public class PantheonShell.Wallpaper : Switchboard.SettingsPage {
continue;
}

var local_uri = file.get_uri ();
var dest = WallpaperOperation.copy_for_library (file);
if (dest != null) {
local_uri = dest.get_uri ();
}

add_wallpaper_from_file (file, local_uri);
add_wallpaper_from_file (file);
}
}
});
Expand Down Expand Up @@ -329,15 +323,10 @@ public class PantheonShell.Wallpaper : Switchboard.SettingsPage {
var subdir = directory.resolve_relative_path (file_info.get_name ());
yield load_wallpapers (subdir.get_path (), cancellable, false);
continue;
} else if (!IOHelper.is_valid_file_type (file_info)) {
// Skip non-picture files
continue;
}

var file = directory.resolve_relative_path (file_info.get_name ());
string uri = file.get_uri ();

add_wallpaper_from_file (file, uri);
add_wallpaper_from_file (file);
}

if (toplevel_folder) {
Expand Down Expand Up @@ -387,39 +376,53 @@ public class PantheonShell.Wallpaper : Switchboard.SettingsPage {
private bool on_drag_data_received (Value val, double x, double y) {
var file_list = (Gdk.FileList) val;
foreach (var file in file_list.get_files ()) {
var local_uri = file.get_uri ();

var dest = WallpaperOperation.copy_for_library (file);
if (dest != null) {
local_uri = dest.get_uri ();
}

add_wallpaper_from_file (file, local_uri);
add_wallpaper_from_file (file);
}

return true;
}

private void add_wallpaper_from_file (GLib.File file, string uri) {
private void add_wallpaper_from_file (GLib.File file) {
var uri = file.get_uri ();

// don't load 'removed' wallpaper on plug reload
if (wallpaper_for_removal != null && wallpaper_for_removal.uri == uri) {
return;
}

var wallpaper = new WallpaperContainer (uri);
wallpaper_model.insert_sorted (wallpaper, wallpapers_sort_function);
try {
var info = file.query_info (string.joinv (",", REQUIRED_FILE_ATTRS), 0);

if (!IOHelper.is_valid_file_type (info)) {
Gdk.Display.get_default ().beep ();
return;
}

wallpaper.trash.connect (() => {
send_undo_toast ();
mark_for_removal (wallpaper);
});
if (!WallpaperOperation.get_is_file_in_bg_dir (file)) {
var local_file = WallpaperOperation.copy_for_library (file);
if (local_file != null) {
uri = local_file.get_uri ();
}
}

// Select the wallpaper if it is the current wallpaper
if (current_wallpaper_path.has_suffix (uri) && gnome_background_settings.get_string ("picture-options") != "none") {
this.wallpaper_view.select_child ((Gtk.FlowBoxChild) wallpaper.get_parent ());
// Set the widget activated without activating it
wallpaper.checked = true;
active_wallpaper = wallpaper;
var wallpaper = new WallpaperContainer (uri);

wallpaper_model.insert_sorted (wallpaper, wallpapers_sort_function);

wallpaper.trash.connect (() => {
send_undo_toast ();
mark_for_removal (wallpaper);
});

// Select the wallpaper if it is the current wallpaper
if (current_wallpaper_path.has_suffix (uri) && gnome_background_settings.get_string ("picture-options") != "none") {
this.wallpaper_view.select_child ((Gtk.FlowBoxChild) wallpaper.get_parent ());
// Set the widget activated without activating it
wallpaper.checked = true;
active_wallpaper = wallpaper;
}
} catch (Error e) {
critical ("Unable to add wallpaper: %s", e.message);
}
}

Expand Down