diff --git a/images/gnome/1024.png b/images/gnome/1024.png new file mode 100644 index 000000000..8accee3dc Binary files /dev/null and b/images/gnome/1024.png differ diff --git a/images/gnome/128.png b/images/gnome/128.png new file mode 100644 index 000000000..cab4dcf9b Binary files /dev/null and b/images/gnome/128.png differ diff --git a/images/gnome/16.png b/images/gnome/16.png new file mode 100644 index 000000000..0212014c9 Binary files /dev/null and b/images/gnome/16.png differ diff --git a/images/gnome/2048.png b/images/gnome/2048.png new file mode 100644 index 000000000..1327d461b Binary files /dev/null and b/images/gnome/2048.png differ diff --git a/images/gnome/256.png b/images/gnome/256.png new file mode 100644 index 000000000..423465c2e Binary files /dev/null and b/images/gnome/256.png differ diff --git a/images/gnome/32.png b/images/gnome/32.png new file mode 100644 index 000000000..28891311e Binary files /dev/null and b/images/gnome/32.png differ diff --git a/images/gnome/512.png b/images/gnome/512.png new file mode 100644 index 000000000..2045204b2 Binary files /dev/null and b/images/gnome/512.png differ diff --git a/images/gnome/64.png b/images/gnome/64.png new file mode 100644 index 000000000..fae92b425 Binary files /dev/null and b/images/gnome/64.png differ diff --git a/src/apprt/gtk-ng/build/gresource.zig b/src/apprt/gtk-ng/build/gresource.zig index 3e192ebbd..3a1cfc22a 100644 --- a/src/apprt/gtk-ng/build/gresource.zig +++ b/src/apprt/gtk-ng/build/gresource.zig @@ -63,8 +63,8 @@ pub const file_inputs = deps: { var deps: [total][]const u8 = undefined; var index: usize = 0; for (icon_sizes) |size| { - deps[index] = std.fmt.comptimePrint("images/icons/icon_{d}.png", .{size}); - deps[index + 1] = std.fmt.comptimePrint("images/icons/icon_{d}@2x.png", .{size}); + deps[index] = std.fmt.comptimePrint("images/gnome/{d}.png", .{size}); + deps[index + 1] = std.fmt.comptimePrint("images/gnome/{d}.png", .{size * 2}); index += 2; } for (blueprints) |bp| { @@ -162,7 +162,7 @@ fn genIcons(writer: anytype) !void { // 1x { const alias = std.fmt.comptimePrint("{d}x{d}", .{ size, size }); - const source = std.fmt.comptimePrint("images/icons/icon_{d}.png", .{size}); + const source = std.fmt.comptimePrint("images/gnome/{d}.png", .{size}); try cwd.access(source, .{}); try writer.print( \\ {s} @@ -175,7 +175,7 @@ fn genIcons(writer: anytype) !void { // 2x { const alias = std.fmt.comptimePrint("{d}x{d}@2", .{ size, size }); - const source = std.fmt.comptimePrint("images/icons/icon_{d}@2x.png", .{size}); + const source = std.fmt.comptimePrint("images/gnome/{d}.png", .{size * 2}); try cwd.access(source, .{}); try writer.print( \\ {s} diff --git a/src/apprt/gtk/gresource.zig b/src/apprt/gtk/gresource.zig index 45623ab2a..4a2e42085 100644 --- a/src/apprt/gtk/gresource.zig +++ b/src/apprt/gtk/gresource.zig @@ -17,7 +17,7 @@ const icons = [_]struct { }, .{ .alias = "16x16@2", - .source = "16@2x", + .source = "32", }, .{ .alias = "32x32", @@ -25,7 +25,7 @@ const icons = [_]struct { }, .{ .alias = "32x32@2", - .source = "32@2x", + .source = "64", }, .{ .alias = "128x128", @@ -33,7 +33,7 @@ const icons = [_]struct { }, .{ .alias = "128x128@2", - .source = "128@2x", + .source = "256", }, .{ .alias = "256x256", @@ -41,7 +41,7 @@ const icons = [_]struct { }, .{ .alias = "256x256@2", - .source = "256@2x", + .source = "512", }, .{ .alias = "512x512", @@ -116,7 +116,7 @@ pub fn main() !void { ); for (icons) |icon| { try writer.print( - " images/icons/icon_{s}.png\n", + " images/gnome/{s}.png\n", .{ icon.alias, icon.source }, ); } @@ -153,7 +153,7 @@ pub const dependencies = deps: { index += 1; } for (icons) |icon| { - deps[index] = std.fmt.comptimePrint("images/icons/icon_{s}.png", .{icon.source}); + deps[index] = std.fmt.comptimePrint("images/gnome/{s}.png", .{icon.source}); index += 1; } for (blueprint_files) |blueprint_file| { diff --git a/src/build/GhosttyResources.zig b/src/build/GhosttyResources.zig index ca95dbbb3..10de2584b 100644 --- a/src/build/GhosttyResources.zig +++ b/src/build/GhosttyResources.zig @@ -360,47 +360,47 @@ fn addLinuxAppResources( // Various icons that our application can use, including the icon // that will be used for the desktop. try steps.append(&b.addInstallFile( - b.path("images/icons/icon_16.png"), + b.path("images/gnome/16.png"), "share/icons/hicolor/16x16/apps/com.mitchellh.ghostty.png", ).step); try steps.append(&b.addInstallFile( - b.path("images/icons/icon_32.png"), + b.path("images/gnome/32.png"), "share/icons/hicolor/32x32/apps/com.mitchellh.ghostty.png", ).step); try steps.append(&b.addInstallFile( - b.path("images/icons/icon_128.png"), + b.path("images/gnome/128.png"), "share/icons/hicolor/128x128/apps/com.mitchellh.ghostty.png", ).step); try steps.append(&b.addInstallFile( - b.path("images/icons/icon_256.png"), + b.path("images/gnome/256.png"), "share/icons/hicolor/256x256/apps/com.mitchellh.ghostty.png", ).step); try steps.append(&b.addInstallFile( - b.path("images/icons/icon_512.png"), + b.path("images/gnome/512.png"), "share/icons/hicolor/512x512/apps/com.mitchellh.ghostty.png", ).step); // Flatpaks only support icons up to 512x512. if (!cfg.flatpak) { try steps.append(&b.addInstallFile( - b.path("images/icons/icon_1024.png"), + b.path("images/gnome/1024.png"), "share/icons/hicolor/1024x1024/apps/com.mitchellh.ghostty.png", ).step); } try steps.append(&b.addInstallFile( - b.path("images/icons/icon_16@2x.png"), + b.path("images/gnome/32.png"), "share/icons/hicolor/16x16@2/apps/com.mitchellh.ghostty.png", ).step); try steps.append(&b.addInstallFile( - b.path("images/icons/icon_32@2x.png"), + b.path("images/gnome/64.png"), "share/icons/hicolor/32x32@2/apps/com.mitchellh.ghostty.png", ).step); try steps.append(&b.addInstallFile( - b.path("images/icons/icon_128@2x.png"), + b.path("images/gnome/256.png"), "share/icons/hicolor/128x128@2/apps/com.mitchellh.ghostty.png", ).step); try steps.append(&b.addInstallFile( - b.path("images/icons/icon_256@2x.png"), + b.path("images/gnome/512.png"), "share/icons/hicolor/256x256@2/apps/com.mitchellh.ghostty.png", ).step); }