summaryrefslogtreecommitdiff
path: root/ext/mac-ui-macgap1-wrapper/src
diff options
context:
space:
mode:
Diffstat (limited to 'ext/mac-ui-macgap1-wrapper/src')
-rw-r--r--ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.pbxproj18
-rw-r--r--ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcshareddata/MacGap.xccheckout4
-rw-r--r--ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/Contents.json63
-rw-r--r--ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application128x128.pngbin11247 -> 0 bytes
-rw-r--r--ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application16x16.pngbin715 -> 0 bytes
-rw-r--r--ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application256x256.pngbin29043 -> 0 bytes
-rw-r--r--ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application32x32.pngbin1787 -> 0 bytes
-rw-r--r--ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application512x512.pngbin57374 -> 0 bytes
-rw-r--r--ext/mac-ui-macgap1-wrapper/src/MacGap/MacGap-Info.plist2
-rw-r--r--ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/MainMenu.xib2
-rw-r--r--ext/mac-ui-macgap1-wrapper/src/application.icnsbin88566 -> 0 bytes
-rw-r--r--ext/mac-ui-macgap1-wrapper/src/public/index.html33
12 files changed, 9 insertions, 113 deletions
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.pbxproj b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.pbxproj
index 9d71cecc..08d72d06 100644
--- a/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.pbxproj
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.pbxproj
@@ -19,7 +19,7 @@
88C0646014BDE10A00E4BCE2 /* Window.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C0645F14BDE10A00E4BCE2 /* Window.m */; };
88C0646614BDEC5800E4BCE2 /* Window.xib in Resources */ = {isa = PBXBuildFile; fileRef = 88C0646414BDEC5800E4BCE2 /* Window.xib */; };
88C0646D14BDF6A600E4BCE2 /* WindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C0646C14BDF6A600E4BCE2 /* WindowController.m */; };
- C13A649D1AFB171100CB31FE /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C13A649C1AFB171100CB31FE /* Images.xcassets */; };
+ C14EFCA71B0986AF00894B5F /* ZeroTierIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = C14EFCA61B0986AF00894B5F /* ZeroTierIcon.icns */; };
C1C2B9911AFB0CF10060D7C2 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1C2B9901AFB0CF10060D7C2 /* Security.framework */; };
F2B80016179E0FC100B069A8 /* Clipboard.m in Sources */ = {isa = PBXBuildFile; fileRef = F2B80015179E0FC100B069A8 /* Clipboard.m */; };
FA32509D14BA813600BF0781 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA32509C14BA813600BF0781 /* WebKit.framework */; };
@@ -30,8 +30,6 @@
FA3250D514BA860800BF0781 /* Dock.m in Sources */ = {isa = PBXBuildFile; fileRef = FA3250CB14BA860800BF0781 /* Dock.m */; };
FA3250D914BA860800BF0781 /* Path.m in Sources */ = {isa = PBXBuildFile; fileRef = FA3250CF14BA860800BF0781 /* Path.m */; };
FA3250DB14BA860800BF0781 /* Sound.m in Sources */ = {isa = PBXBuildFile; fileRef = FA3250D114BA860800BF0781 /* Sound.m */; };
- FA3250E514BA883A00BF0781 /* public in Resources */ = {isa = PBXBuildFile; fileRef = FA3250E414BA883A00BF0781 /* public */; };
- FA3250E714BA8BCE00BF0781 /* application.icns in Resources */ = {isa = PBXBuildFile; fileRef = FA3250E614BA8BCE00BF0781 /* application.icns */; };
FA3F7742168F70790027B324 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA3F7741168F70780027B324 /* Cocoa.framework */; };
FAE451C914BA79C600190544 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = FAE451C714BA79C600190544 /* InfoPlist.strings */; };
FAE451CB14BA79C600190544 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = FAE451CA14BA79C600190544 /* main.m */; };
@@ -75,7 +73,7 @@
88C0646514BDEC5800E4BCE2 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/Window.xib; sourceTree = "<group>"; };
88C0646B14BDF6A600E4BCE2 /* WindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowController.h; sourceTree = "<group>"; };
88C0646C14BDF6A600E4BCE2 /* WindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WindowController.m; sourceTree = "<group>"; };
- C13A649C1AFB171100CB31FE /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
+ C14EFCA61B0986AF00894B5F /* ZeroTierIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = ZeroTierIcon.icns; path = ../../../../artwork/ZeroTierIcon.icns; sourceTree = "<group>"; };
C1C2B9901AFB0CF10060D7C2 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
F2B80014179E0FC100B069A8 /* Clipboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Clipboard.h; sourceTree = "<group>"; };
F2B80015179E0FC100B069A8 /* Clipboard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Clipboard.m; sourceTree = "<group>"; };
@@ -95,8 +93,6 @@
FA3250CF14BA860800BF0781 /* Path.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = Path.m; path = Classes/Commands/Path.m; sourceTree = "<group>"; };
FA3250D014BA860800BF0781 /* Sound.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Sound.h; path = Classes/Commands/Sound.h; sourceTree = "<group>"; };
FA3250D114BA860800BF0781 /* Sound.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = Sound.m; path = Classes/Commands/Sound.m; sourceTree = "<group>"; };
- FA3250E414BA883A00BF0781 /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
- FA3250E614BA8BCE00BF0781 /* application.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = application.icns; sourceTree = SOURCE_ROOT; };
FA3F7741168F70780027B324 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; };
FAE451BA14BA79C600190544 /* ZeroTier One.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ZeroTier One.app"; sourceTree = BUILT_PRODUCTS_DIR; };
FAE451BE14BA79C600190544 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
@@ -184,7 +180,6 @@
isa = PBXGroup;
children = (
FA3F7741168F70780027B324 /* Cocoa.framework */,
- FA3250E414BA883A00BF0781 /* public */,
FAE451C414BA79C600190544 /* MacGap */,
FAE451BD14BA79C600190544 /* Frameworks */,
FAE451BB14BA79C600190544 /* Products */,
@@ -227,9 +222,9 @@
FA3250E014BA87B800BF0781 /* Classes */,
FAE451D014BA79C600190544 /* AppDelegate.h */,
FAE451D114BA79C600190544 /* AppDelegate.m */,
+ C14EFCA61B0986AF00894B5F /* ZeroTierIcon.icns */,
FAE451D314BA79C600190544 /* MainMenu.xib */,
88C0646414BDEC5800E4BCE2 /* Window.xib */,
- C13A649C1AFB171100CB31FE /* Images.xcassets */,
FAE451C514BA79C600190544 /* Supporting Files */,
);
path = MacGap;
@@ -238,7 +233,6 @@
FAE451C514BA79C600190544 /* Supporting Files */ = {
isa = PBXGroup;
children = (
- FA3250E614BA8BCE00BF0781 /* application.icns */,
FAE451C614BA79C600190544 /* MacGap-Info.plist */,
FAE451C714BA79C600190544 /* InfoPlist.strings */,
FAE451CA14BA79C600190544 /* main.m */,
@@ -300,12 +294,10 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- FA3250E514BA883A00BF0781 /* public in Resources */,
+ C14EFCA71B0986AF00894B5F /* ZeroTierIcon.icns in Resources */,
FAE451C914BA79C600190544 /* InfoPlist.strings in Resources */,
- C13A649D1AFB171100CB31FE /* Images.xcassets in Resources */,
FAE451CF14BA79C600190544 /* Credits.rtf in Resources */,
FAE451D514BA79C600190544 /* MainMenu.xib in Resources */,
- FA3250E714BA8BCE00BF0781 /* application.icns in Resources */,
88C0646614BDEC5800E4BCE2 /* Window.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -430,7 +422,6 @@
FAE451D914BA79C600190544 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
CLANG_CXX_LIBRARY = "compiler-default";
COMBINE_HIDPI_IMAGES = YES;
@@ -452,7 +443,6 @@
FAE451DA14BA79C600190544 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
CLANG_CXX_LIBRARY = "compiler-default";
COMBINE_HIDPI_IMAGES = YES;
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcshareddata/MacGap.xccheckout b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcshareddata/MacGap.xccheckout
index 2a06dbc5..7fdde853 100644
--- a/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcshareddata/MacGap.xccheckout
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcshareddata/MacGap.xccheckout
@@ -14,11 +14,11 @@
<string>http://adam.ierymenko@git.int.zerotier.com/zerotier/zerotierone</string>
</dict>
<key>IDESourceControlProjectPath</key>
- <string>ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj</string>
+ <string>ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>ABA3617E9F0148F844A82502F0D808DE6591AA97</key>
- <string>../../../..</string>
+ <string>../../../../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>http://adam.ierymenko@git.int.zerotier.com/zerotier/zerotierone</string>
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/Contents.json b/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 2592eae9..00000000
--- a/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "mac",
- "scale" : "2x",
- "size" : "16x16"
- },
- {
- "size" : "16x16",
- "idiom" : "mac",
- "filename" : "application16x16.png",
- "scale" : "1x"
- },
- {
- "size" : "32x32",
- "idiom" : "mac",
- "filename" : "application32x32.png",
- "scale" : "1x"
- },
- {
- "idiom" : "mac",
- "scale" : "2x",
- "size" : "32x32"
- },
- {
- "size" : "128x128",
- "idiom" : "mac",
- "filename" : "application128x128.png",
- "scale" : "1x"
- },
- {
- "idiom" : "mac",
- "scale" : "2x",
- "size" : "128x128"
- },
- {
- "size" : "256x256",
- "idiom" : "mac",
- "filename" : "application256x256.png",
- "scale" : "1x"
- },
- {
- "idiom" : "mac",
- "scale" : "2x",
- "size" : "256x256"
- },
- {
- "size" : "512x512",
- "idiom" : "mac",
- "filename" : "application512x512.png",
- "scale" : "1x"
- },
- {
- "idiom" : "mac",
- "scale" : "2x",
- "size" : "512x512"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-} \ No newline at end of file
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application128x128.png b/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application128x128.png
deleted file mode 100644
index 93dd80a1..00000000
--- a/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application128x128.png
+++ /dev/null
Binary files differ
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application16x16.png b/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application16x16.png
deleted file mode 100644
index 3aa19da6..00000000
--- a/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application16x16.png
+++ /dev/null
Binary files differ
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application256x256.png b/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application256x256.png
deleted file mode 100644
index c30106b7..00000000
--- a/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application256x256.png
+++ /dev/null
Binary files differ
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application32x32.png b/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application32x32.png
deleted file mode 100644
index 05ff6cb8..00000000
--- a/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application32x32.png
+++ /dev/null
Binary files differ
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application512x512.png b/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application512x512.png
deleted file mode 100644
index b6b9da61..00000000
--- a/ext/mac-ui-macgap1-wrapper/src/MacGap/Images.xcassets/AppIcon.appiconset/application512x512.png
+++ /dev/null
Binary files differ
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/MacGap-Info.plist b/ext/mac-ui-macgap1-wrapper/src/MacGap/MacGap-Info.plist
index 3730da8f..7e10a7a6 100644
--- a/ext/mac-ui-macgap1-wrapper/src/MacGap/MacGap-Info.plist
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/MacGap-Info.plist
@@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
+ <key>CFBundleIconFile</key>
+ <string>ZeroTierIcon</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/MainMenu.xib b/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/MainMenu.xib
index 998c505a..61dafbcc 100644
--- a/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/MainMenu.xib
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/MainMenu.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
- <int key="IBDocument.SystemTarget">1080</int>
+ <int key="IBDocument.SystemTarget">1070</int>
<string key="IBDocument.SystemVersion">14D136</string>
<string key="IBDocument.InterfaceBuilderVersion">7702</string>
<string key="IBDocument.AppKitVersion">1347.57</string>
diff --git a/ext/mac-ui-macgap1-wrapper/src/application.icns b/ext/mac-ui-macgap1-wrapper/src/application.icns
deleted file mode 100644
index e4bcb281..00000000
--- a/ext/mac-ui-macgap1-wrapper/src/application.icns
+++ /dev/null
Binary files differ
diff --git a/ext/mac-ui-macgap1-wrapper/src/public/index.html b/ext/mac-ui-macgap1-wrapper/src/public/index.html
deleted file mode 100644
index 9fab9325..00000000
--- a/ext/mac-ui-macgap1-wrapper/src/public/index.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>MacGap</title>
- <style type="text/css" media="screen">
- html, body {
- height: 100%;
- width: 100%;
- background: #FFF;
- padding: 0;
- margin: 0;
- overflow: hidden;
- -webkit-user-select: none;
- }
-
- h1 {
- color: #E0E0E0;
- margin: 18% 0;
- text-align: center;
- font-family: helvetica;
- }
- </style>
-
-</head>
-<body>
-
- <script type="text/javascript" charset="utf-8">
- macgap.notice.notify({title: 'MacGap', content: 'Hello World'});
- </script>
-
- <h1>MacGap</h1>
-</body>
-</html> \ No newline at end of file