diff --git a/README.md b/README.md index 861e0937a..4cafc6ac1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

- Logo + Logo
Ghostty

diff --git a/build.zig b/build.zig index d233bff1f..093afe481 100644 --- a/build.zig +++ b/build.zig @@ -578,15 +578,15 @@ pub fn build(b: *std.Build) !void { // Various icons that our application can use, including the icon // that will be used for the desktop. - b.installFile("images/icons/icon_16x16.png", "share/icons/hicolor/16x16/apps/com.mitchellh.ghostty.png"); - b.installFile("images/icons/icon_32x32.png", "share/icons/hicolor/32x32/apps/com.mitchellh.ghostty.png"); - b.installFile("images/icons/icon_128x128.png", "share/icons/hicolor/128x128/apps/com.mitchellh.ghostty.png"); - b.installFile("images/icons/icon_256x256.png", "share/icons/hicolor/256x256/apps/com.mitchellh.ghostty.png"); - b.installFile("images/icons/icon_512x512.png", "share/icons/hicolor/512x512/apps/com.mitchellh.ghostty.png"); - b.installFile("images/icons/icon_16x16@2x@2x.png", "share/icons/hicolor/16x16@2/apps/com.mitchellh.ghostty.png"); - b.installFile("images/icons/icon_32x32@2x@2x.png", "share/icons/hicolor/32x32@2/apps/com.mitchellh.ghostty.png"); - b.installFile("images/icons/icon_128x128@2x@2x.png", "share/icons/hicolor/128x128@2/apps/com.mitchellh.ghostty.png"); - b.installFile("images/icons/icon_256x256@2x@2x.png", "share/icons/hicolor/256x256@2/apps/com.mitchellh.ghostty.png"); + b.installFile("images/icons/icon_16.png", "share/icons/hicolor/16x16/apps/com.mitchellh.ghostty.png"); + b.installFile("images/icons/icon_32.png", "share/icons/hicolor/32x32/apps/com.mitchellh.ghostty.png"); + b.installFile("images/icons/icon_128.png", "share/icons/hicolor/128x128/apps/com.mitchellh.ghostty.png"); + b.installFile("images/icons/icon_256.png", "share/icons/hicolor/256x256/apps/com.mitchellh.ghostty.png"); + b.installFile("images/icons/icon_512.png", "share/icons/hicolor/512x512/apps/com.mitchellh.ghostty.png"); + b.installFile("images/icons/icon_16@2x.png", "share/icons/hicolor/16x16@2/apps/com.mitchellh.ghostty.png"); + b.installFile("images/icons/icon_32@2x.png", "share/icons/hicolor/32x32@2/apps/com.mitchellh.ghostty.png"); + b.installFile("images/icons/icon_128@2x.png", "share/icons/hicolor/128x128@2/apps/com.mitchellh.ghostty.png"); + b.installFile("images/icons/icon_256@2x.png", "share/icons/hicolor/256x256@2/apps/com.mitchellh.ghostty.png"); } // libghostty (non-Darwin) diff --git a/dist/macos/Ghostty.icns b/dist/macos/Ghostty.icns old mode 100755 new mode 100644 index 52365a405..44a44711a Binary files a/dist/macos/Ghostty.icns and b/dist/macos/Ghostty.icns differ diff --git a/dist/windows/ghostty.ico b/dist/windows/ghostty.ico index 1fe7ed98d..1c5afc258 100644 Binary files a/dist/windows/ghostty.ico and b/dist/windows/ghostty.ico differ diff --git a/images/icons/icon_1024.png b/images/icons/icon_1024.png new file mode 100644 index 000000000..a0b716c87 Binary files /dev/null and b/images/icons/icon_1024.png differ diff --git a/images/icons/icon_128.png b/images/icons/icon_128.png new file mode 100644 index 000000000..bad0eb891 Binary files /dev/null and b/images/icons/icon_128.png differ diff --git a/images/icons/icon_128@2x.png b/images/icons/icon_128@2x.png new file mode 100644 index 000000000..46c3f7050 Binary files /dev/null and b/images/icons/icon_128@2x.png differ diff --git a/images/icons/icon_128x128.png b/images/icons/icon_128x128.png deleted file mode 100755 index 7b581449b..000000000 Binary files a/images/icons/icon_128x128.png and /dev/null differ diff --git a/images/icons/icon_128x128@2x@2x.png b/images/icons/icon_128x128@2x@2x.png deleted file mode 100755 index 1c29b7011..000000000 Binary files a/images/icons/icon_128x128@2x@2x.png and /dev/null differ diff --git a/images/icons/icon_16.png b/images/icons/icon_16.png new file mode 100644 index 000000000..cacff7a54 Binary files /dev/null and b/images/icons/icon_16.png differ diff --git a/images/icons/icon_16@2x.png b/images/icons/icon_16@2x.png new file mode 100644 index 000000000..b35e66641 Binary files /dev/null and b/images/icons/icon_16@2x.png differ diff --git a/images/icons/icon_16x16.png b/images/icons/icon_16x16.png deleted file mode 100755 index 6a9dbbfde..000000000 Binary files a/images/icons/icon_16x16.png and /dev/null differ diff --git a/images/icons/icon_16x16@2x@2x.png b/images/icons/icon_16x16@2x@2x.png deleted file mode 100755 index 5e738dfd3..000000000 Binary files a/images/icons/icon_16x16@2x@2x.png and /dev/null differ diff --git a/images/icons/icon_256.png b/images/icons/icon_256.png new file mode 100644 index 000000000..803224416 Binary files /dev/null and b/images/icons/icon_256.png differ diff --git a/images/icons/icon_256@2x.png b/images/icons/icon_256@2x.png new file mode 100644 index 000000000..b51b8d7dc Binary files /dev/null and b/images/icons/icon_256@2x.png differ diff --git a/images/icons/icon_256x256.png b/images/icons/icon_256x256.png deleted file mode 100755 index 2dda0d6d3..000000000 Binary files a/images/icons/icon_256x256.png and /dev/null differ diff --git a/images/icons/icon_256x256@2x@2x.png b/images/icons/icon_256x256@2x@2x.png deleted file mode 100755 index b0b5c70aa..000000000 Binary files a/images/icons/icon_256x256@2x@2x.png and /dev/null differ diff --git a/images/icons/icon_32.png b/images/icons/icon_32.png new file mode 100644 index 000000000..b647bcf35 Binary files /dev/null and b/images/icons/icon_32.png differ diff --git a/images/icons/icon_32@2x.png b/images/icons/icon_32@2x.png new file mode 100644 index 000000000..e394a5170 Binary files /dev/null and b/images/icons/icon_32@2x.png differ diff --git a/images/icons/icon_32x32.png b/images/icons/icon_32x32.png deleted file mode 100755 index 5e738dfd3..000000000 Binary files a/images/icons/icon_32x32.png and /dev/null differ diff --git a/images/icons/icon_32x32@2x@2x.png b/images/icons/icon_32x32@2x@2x.png deleted file mode 100755 index c7cbb7f58..000000000 Binary files a/images/icons/icon_32x32@2x@2x.png and /dev/null differ diff --git a/images/icons/icon_512.png b/images/icons/icon_512.png new file mode 100644 index 000000000..b51b8d7dc Binary files /dev/null and b/images/icons/icon_512.png differ diff --git a/images/icons/icon_512x512.png b/images/icons/icon_512x512.png deleted file mode 100755 index b0b5c70aa..000000000 Binary files a/images/icons/icon_512x512.png and /dev/null differ diff --git a/images/icons/icon_512x512@2x@2x.png b/images/icons/icon_512x512@2x@2x.png deleted file mode 100755 index 0368b4a42..000000000 Binary files a/images/icons/icon_512x512@2x@2x.png and /dev/null differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/Contents.json b/macos/Assets.xcassets/AppIcon.appiconset/Contents.json index eb3bbadd8..9c6bc2e81 100644 --- a/macos/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/macos/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,67 +1,67 @@ { "images" : [ { - "filename" : "icon_512x512@2x@2x 1.png", + "filename" : "macOS-AppIcon-1024px.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" }, { - "filename" : "icon_16x16.png", + "filename" : "macOS-AppIcon-16px-16pt@1x.png", "idiom" : "mac", "scale" : "1x", "size" : "16x16" }, { - "filename" : "icon_16x16@2x@2x.png", + "filename" : "macOS-AppIcon-32px-16pt@2x.png", "idiom" : "mac", "scale" : "2x", "size" : "16x16" }, { - "filename" : "icon_32x32.png", + "filename" : "macOS-AppIcon-32px-32pt@1x.png", "idiom" : "mac", "scale" : "1x", "size" : "32x32" }, { - "filename" : "icon_32x32@2x@2x.png", + "filename" : "macOS-AppIcon-64px-32pt@2x.png", "idiom" : "mac", "scale" : "2x", "size" : "32x32" }, { - "filename" : "icon_128x128.png", + "filename" : "macOS-AppIcon-128px-128pt@1x.png", "idiom" : "mac", "scale" : "1x", "size" : "128x128" }, { - "filename" : "icon_128x128@2x@2x.png", + "filename" : "macOS-AppIcon-256px-128pt@2x.png", "idiom" : "mac", "scale" : "2x", "size" : "128x128" }, { - "filename" : "icon_256x256.png", + "filename" : "macOS-AppIcon-256px-128pt@2x 1.png", "idiom" : "mac", "scale" : "1x", "size" : "256x256" }, { - "filename" : "icon_256x256@2x@2x.png", + "filename" : "macOS-AppIcon-512px-256pt@2x.png", "idiom" : "mac", "scale" : "2x", "size" : "256x256" }, { - "filename" : "icon_512x512.png", + "filename" : "macOS-AppIcon-512px.png", "idiom" : "mac", "scale" : "1x", "size" : "512x512" }, { - "filename" : "icon_512x512@2x@2x.png", + "filename" : "macOS-AppIcon-1024px 1.png", "idiom" : "mac", "scale" : "2x", "size" : "512x512" diff --git a/macos/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/macos/Assets.xcassets/AppIcon.appiconset/icon_128x128.png deleted file mode 100644 index 7b581449b..000000000 Binary files a/macos/Assets.xcassets/AppIcon.appiconset/icon_128x128.png and /dev/null differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x@2x.png b/macos/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x@2x.png deleted file mode 100644 index 1c29b7011..000000000 Binary files a/macos/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x@2x.png and /dev/null differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/macos/Assets.xcassets/AppIcon.appiconset/icon_16x16.png deleted file mode 100644 index d7cb16795..000000000 Binary files a/macos/Assets.xcassets/AppIcon.appiconset/icon_16x16.png and /dev/null differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x@2x.png b/macos/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x@2x.png deleted file mode 100644 index 5e738dfd3..000000000 Binary files a/macos/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x@2x.png and /dev/null differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/macos/Assets.xcassets/AppIcon.appiconset/icon_256x256.png deleted file mode 100644 index 2dda0d6d3..000000000 Binary files a/macos/Assets.xcassets/AppIcon.appiconset/icon_256x256.png and /dev/null differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x@2x.png b/macos/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x@2x.png deleted file mode 100644 index b0b5c70aa..000000000 Binary files a/macos/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x@2x.png and /dev/null differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/macos/Assets.xcassets/AppIcon.appiconset/icon_32x32.png deleted file mode 100644 index 5e738dfd3..000000000 Binary files a/macos/Assets.xcassets/AppIcon.appiconset/icon_32x32.png and /dev/null differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x@2x.png b/macos/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x@2x.png deleted file mode 100644 index c7cbb7f58..000000000 Binary files a/macos/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x@2x.png and /dev/null differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512.png deleted file mode 100644 index b0b5c70aa..000000000 Binary files a/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512.png and /dev/null differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x@2x 1.png b/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x@2x 1.png deleted file mode 100644 index 0368b4a42..000000000 Binary files a/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x@2x 1.png and /dev/null differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x@2x.png b/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x@2x.png deleted file mode 100644 index 0368b4a42..000000000 Binary files a/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x@2x.png and /dev/null differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-1024px 1.png b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-1024px 1.png new file mode 100644 index 000000000..a0b716c87 Binary files /dev/null and b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-1024px 1.png differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-1024px.png b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-1024px.png new file mode 100644 index 000000000..a0b716c87 Binary files /dev/null and b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-1024px.png differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-128px-128pt@1x.png b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-128px-128pt@1x.png new file mode 100644 index 000000000..bad0eb891 Binary files /dev/null and b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-128px-128pt@1x.png differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-16px-16pt@1x.png b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-16px-16pt@1x.png new file mode 100644 index 000000000..cacff7a54 Binary files /dev/null and b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-16px-16pt@1x.png differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-256px-128pt@2x 1.png b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-256px-128pt@2x 1.png new file mode 100644 index 000000000..46c3f7050 Binary files /dev/null and b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-256px-128pt@2x 1.png differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-256px-128pt@2x.png b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-256px-128pt@2x.png new file mode 100644 index 000000000..46c3f7050 Binary files /dev/null and b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-256px-128pt@2x.png differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-32px-16pt@2x.png b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-32px-16pt@2x.png new file mode 100644 index 000000000..c8011a605 Binary files /dev/null and b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-32px-16pt@2x.png differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-32px-32pt@1x.png b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-32px-32pt@1x.png new file mode 100644 index 000000000..5e68d5fd0 Binary files /dev/null and b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-32px-32pt@1x.png differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-512px-256pt@2x.png b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-512px-256pt@2x.png new file mode 100644 index 000000000..b51b8d7dc Binary files /dev/null and b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-512px-256pt@2x.png differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-512px.png b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-512px.png new file mode 100644 index 000000000..f302b40bb Binary files /dev/null and b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-512px.png differ diff --git a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-64px-32pt@2x.png b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-64px-32pt@2x.png new file mode 100644 index 000000000..e394a5170 Binary files /dev/null and b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-64px-32pt@2x.png differ diff --git a/macos/Assets.xcassets/AppIconImage.imageset/Contents.json b/macos/Assets.xcassets/AppIconImage.imageset/Contents.json index 44659dc1a..2711a9584 100644 --- a/macos/Assets.xcassets/AppIconImage.imageset/Contents.json +++ b/macos/Assets.xcassets/AppIconImage.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "icon_128x128.png", + "filename" : "macOS-AppIcon-256px-128pt@2x.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "icon_128x128@2x@2x.png", + "filename" : "macOS-AppIcon-512px.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_256x256@2x@2x.png", + "filename" : "macOS-AppIcon-1024px.png", "idiom" : "universal", "scale" : "3x" } diff --git a/macos/Assets.xcassets/AppIconImage.imageset/icon_128x128.png b/macos/Assets.xcassets/AppIconImage.imageset/icon_128x128.png deleted file mode 100644 index 7b581449b..000000000 Binary files a/macos/Assets.xcassets/AppIconImage.imageset/icon_128x128.png and /dev/null differ diff --git a/macos/Assets.xcassets/AppIconImage.imageset/icon_128x128@2x@2x.png b/macos/Assets.xcassets/AppIconImage.imageset/icon_128x128@2x@2x.png deleted file mode 100644 index 1c29b7011..000000000 Binary files a/macos/Assets.xcassets/AppIconImage.imageset/icon_128x128@2x@2x.png and /dev/null differ diff --git a/macos/Assets.xcassets/AppIconImage.imageset/icon_256x256@2x@2x.png b/macos/Assets.xcassets/AppIconImage.imageset/icon_256x256@2x@2x.png deleted file mode 100644 index b0b5c70aa..000000000 Binary files a/macos/Assets.xcassets/AppIconImage.imageset/icon_256x256@2x@2x.png and /dev/null differ diff --git a/macos/Assets.xcassets/AppIconImage.imageset/macOS-AppIcon-1024px.png b/macos/Assets.xcassets/AppIconImage.imageset/macOS-AppIcon-1024px.png new file mode 100644 index 000000000..a0b716c87 Binary files /dev/null and b/macos/Assets.xcassets/AppIconImage.imageset/macOS-AppIcon-1024px.png differ diff --git a/macos/Assets.xcassets/AppIconImage.imageset/macOS-AppIcon-256px-128pt@2x.png b/macos/Assets.xcassets/AppIconImage.imageset/macOS-AppIcon-256px-128pt@2x.png new file mode 100644 index 000000000..46c3f7050 Binary files /dev/null and b/macos/Assets.xcassets/AppIconImage.imageset/macOS-AppIcon-256px-128pt@2x.png differ diff --git a/macos/Assets.xcassets/AppIconImage.imageset/macOS-AppIcon-512px.png b/macos/Assets.xcassets/AppIconImage.imageset/macOS-AppIcon-512px.png new file mode 100644 index 000000000..6d44fc9f3 Binary files /dev/null and b/macos/Assets.xcassets/AppIconImage.imageset/macOS-AppIcon-512px.png differ diff --git a/src/apprt/gtk/gresource.zig b/src/apprt/gtk/gresource.zig index db987cbea..07baa65c6 100644 --- a/src/apprt/gtk/gresource.zig +++ b/src/apprt/gtk/gresource.zig @@ -13,39 +13,39 @@ const icons = [_]struct { }{ .{ .alias = "16x16", - .source = "16x16", + .source = "16", }, .{ .alias = "16x16@2", - .source = "16x16@2x@2x", + .source = "16@2x", }, .{ .alias = "32x32", - .source = "32x32", + .source = "32", }, .{ .alias = "32x32@2", - .source = "32x32@2x@2x", + .source = "32@2x", }, .{ .alias = "128x128", - .source = "128x128", + .source = "128", }, .{ .alias = "128x128@2", - .source = "128x128@2x@2x", + .source = "128@2x", }, .{ .alias = "256x256", - .source = "256x256", + .source = "256", }, .{ .alias = "256x256@2", - .source = "256x256@2x@2x", + .source = "256@2x", }, .{ .alias = "512x512", - .source = "512x512", + .source = "512", }, };