summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ZeroTier One.xcodeproj/project.pbxproj6
-rw-r--r--ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json3
-rw-r--r--ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.pngbin0 -> 51309 bytes
-rw-r--r--ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json4
-rw-r--r--ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar.pngbin0 -> 392 bytes
-rw-r--r--ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.pngbin0 -> 761 bytes
-rw-r--r--ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac.pngbin3810 -> 0 bytes
-rw-r--r--ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac@2x.pngbin5444 -> 0 bytes
-rw-r--r--ZeroTier One/Info.plist2
-rw-r--r--ZeroTier One/ZeroTierIcon.icnsbin0 -> 125598 bytes
10 files changed, 9 insertions, 6 deletions
diff --git a/ZeroTier One.xcodeproj/project.pbxproj b/ZeroTier One.xcodeproj/project.pbxproj
index ed054cb4..5aa71456 100644
--- a/ZeroTier One.xcodeproj/project.pbxproj
+++ b/ZeroTier One.xcodeproj/project.pbxproj
@@ -8,6 +8,7 @@
/* Begin PBXBuildFile section */
932D472D1D138B0C004BCFE2 /* NetworkMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 932D472C1D138B0C004BCFE2 /* NetworkMonitor.swift */; };
+ 932D472F1D1CD499004BCFE2 /* ZeroTierIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 932D472E1D1CD499004BCFE2 /* ZeroTierIcon.icns */; };
9330F1351CEAB4C400687EC8 /* ServiceCom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9330F1341CEAB4C400687EC8 /* ServiceCom.swift */; };
9330F1371CEBF87200687EC8 /* Network.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9330F1361CEBF87200687EC8 /* Network.swift */; };
9330F13B1CF534E500687EC8 /* NetworkInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9330F13A1CF534E500687EC8 /* NetworkInfoCell.swift */; };
@@ -23,6 +24,7 @@
/* Begin PBXFileReference section */
932D472C1D138B0C004BCFE2 /* NetworkMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkMonitor.swift; sourceTree = "<group>"; };
+ 932D472E1D1CD499004BCFE2 /* ZeroTierIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = ZeroTierIcon.icns; sourceTree = "<group>"; };
9330F1341CEAB4C400687EC8 /* ServiceCom.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceCom.swift; sourceTree = "<group>"; };
9330F1361CEBF87200687EC8 /* Network.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Network.swift; sourceTree = "<group>"; };
9330F13A1CF534E500687EC8 /* NetworkInfoCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkInfoCell.swift; sourceTree = "<group>"; };
@@ -70,6 +72,7 @@
93326BDA1CE7C816005CA2AC /* ZeroTier One */ = {
isa = PBXGroup;
children = (
+ 932D472E1D1CD499004BCFE2 /* ZeroTierIcon.icns */,
93326BDB1CE7C816005CA2AC /* AppDelegate.swift */,
93326BE81CE7D9B9005CA2AC /* JoinNetworkViewController.swift */,
9330F1361CEBF87200687EC8 /* Network.swift */,
@@ -151,6 +154,7 @@
93326BEB1CE7D9B9005CA2AC /* JoinNetworkViewController.xib in Resources */,
93326BDE1CE7C816005CA2AC /* Assets.xcassets in Resources */,
93326BE11CE7C816005CA2AC /* MainMenu.xib in Resources */,
+ 932D472F1D1CD499004BCFE2 /* ZeroTierIcon.icns in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -271,7 +275,6 @@
93326BE61CE7C816005CA2AC /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = "ZeroTier One/Info.plist";
@@ -287,7 +290,6 @@
93326BE71CE7C816005CA2AC /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = "ZeroTier One/Info.plist";
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
--- /dev/null
+++ b/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png
Binary files 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
--- /dev/null
+++ b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar.png
Binary files 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
--- /dev/null
+++ b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png
Binary files 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
--- a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac.png
+++ /dev/null
Binary files 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
--- a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac@2x.png
+++ /dev/null
Binary files 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 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIconFile</key>
- <string></string>
+ <string>ZeroTierIcon.icns</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
diff --git a/ZeroTier One/ZeroTierIcon.icns b/ZeroTier One/ZeroTierIcon.icns
new file mode 100644
index 00000000..17e60d58
--- /dev/null
+++ b/ZeroTier One/ZeroTierIcon.icns
Binary files differ