From c3deedd6fd2198f2ee379c896aee55b7c6d894cb Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Thu, 23 Jun 2016 19:44:00 -0700 Subject: Fix menu bar icon. Add app icon. --- .../Assets.xcassets/AppIcon.appiconset/Contents.json | 3 ++- .../AppIcon.appiconset/ZeroTierIcon512x512.png | Bin 0 -> 51309 bytes .../MenuBarIconMac.imageset/Contents.json | 4 ++-- .../MenuBarIconMac.imageset/MenuBar.png | Bin 0 -> 392 bytes .../MenuBarIconMac.imageset/MenuBar@2x.png | Bin 0 -> 761 bytes .../MenuBarIconMac.imageset/MenuBarIconMac.png | Bin 3810 -> 0 bytes .../MenuBarIconMac.imageset/MenuBarIconMac@2x.png | Bin 5444 -> 0 bytes ZeroTier One/Info.plist | 2 +- ZeroTier One/ZeroTierIcon.icns | Bin 0 -> 125598 bytes 9 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png create mode 100644 ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar.png create mode 100644 ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png delete mode 100644 ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac.png delete mode 100644 ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac@2x.png create mode 100644 ZeroTier One/ZeroTierIcon.icns (limited to 'ZeroTier One') diff --git a/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json b/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json index 2db2b1c7..24c81d35 100644 --- a/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -41,8 +41,9 @@ "scale" : "2x" }, { - "idiom" : "mac", "size" : "512x512", + "idiom" : "mac", + "filename" : "ZeroTierIcon512x512.png", "scale" : "1x" }, { diff --git a/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png b/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png new file mode 100644 index 00000000..d225c2e3 Binary files /dev/null and b/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png differ diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json index ab75ef9a..3213cbe1 100644 --- a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json +++ b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json @@ -2,12 +2,12 @@ "images" : [ { "idiom" : "mac", - "filename" : "MenuBarIconMac.png", + "filename" : "MenuBar.png", "scale" : "1x" }, { "idiom" : "mac", - "filename" : "MenuBarIconMac@2x.png", + "filename" : "MenuBar@2x.png", "scale" : "2x" } ], diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar.png b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar.png new file mode 100644 index 00000000..2734f6b6 Binary files /dev/null and b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar.png differ diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png new file mode 100644 index 00000000..08afad40 Binary files /dev/null and b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png differ diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac.png b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac.png deleted file mode 100644 index 74e59fe7..00000000 Binary files a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac.png and /dev/null differ diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac@2x.png b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac@2x.png deleted file mode 100644 index 1c99f851..00000000 Binary files a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac@2x.png and /dev/null differ diff --git a/ZeroTier One/Info.plist b/ZeroTier One/Info.plist index 87cfc3f6..80b0c466 100644 --- a/ZeroTier One/Info.plist +++ b/ZeroTier One/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIconFile - + ZeroTierIcon.icns CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion diff --git a/ZeroTier One/ZeroTierIcon.icns b/ZeroTier One/ZeroTierIcon.icns new file mode 100644 index 00000000..17e60d58 Binary files /dev/null and b/ZeroTier One/ZeroTierIcon.icns differ -- cgit v1.2.3