Adds ability to choose custom dock icons via the Dock's menu

.gitignore

@@ -30,39 +30,5 @@ DerivedData/
 *.dSYM.zip
 *.dSYM
 
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# Pods/
-#
-# Add this line if you want to avoid checking in source code from the Xcode workspace
-# *.xcworkspace
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build/
-
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo.
-# Instead, use fastlane to re-generate the screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://docs.fastlane.tools/best-practices/source-control/#source-control
-
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots/**/*.png
-fastlane/test_output
-
-# Code Injection
-#
-# After new code Injection tools there's a generated folder /iOSInjectionProject
-# https://github.com/johnno1962/injectionforxcode
-
-iOSInjectionProject/
+# macOS nonsense
+*.DS_Store

ObjC/DockTile.ObjC-Info.plist

@@ -16,10 +16,12 @@
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>3</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.6</string>
 	<key>NSDockTilePlugIn</key>
@@ -28,5 +30,20 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>DockIconsToChooseFrom</key>
+	<array>
+		<dict>
+			<key>title</key>
+			<string>Classic Icon</string>
+			<key>file name</key>
+			<string>icon.icns</string>
+		</dict>
+		<dict>
+			<key>title</key>
+			<string>Squircle Icon</string>
+			<key>file name</key>
+			<string>icon2.icns</string>
+		</dict>
+	</array>
 </dict>
 </plist>

ObjC/DockTile.ObjC.xcodeproj/project.pbxproj

@@ -16,6 +16,11 @@
 		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+		A42C411A26BD4A260055F67C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A42C411926BD4A260055F67C /* Foundation.framework */; };
+		A42C411C26BD4A370055F67C /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A42C411B26BD4A370055F67C /* AppKit.framework */; };
+		A42C412326BD4F1D0055F67C /* icon2.icns in Resources */ = {isa = PBXBuildFile; fileRef = A42C412226BD4F1D0055F67C /* icon2.icns */; };
+		A42C412626BD4F5A0055F67C /* SharedDockItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A42C412426BD4F5A0055F67C /* SharedDockItem.m */; };
+		A42C412726BD4F5A0055F67C /* SharedDockItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A42C412426BD4F5A0055F67C /* SharedDockItem.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -60,13 +65,20 @@
 		9673543E23A9035700FD6C03 /* Base */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Base; path = Base.lproj/MainMenu.nib; sourceTree = "<group>"; };
 		9673543F23A9035D00FD6C03 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Credits.rtf; sourceTree = "<group>"; };
 		9673544023A9035D00FD6C03 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		A42C411926BD4A260055F67C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		A42C411B26BD4A370055F67C /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		A42C412226BD4F1D0055F67C /* icon2.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon2.icns; sourceTree = "<group>"; };
+		A42C412426BD4F5A0055F67C /* SharedDockItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SharedDockItem.m; path = DockTilePlugIn/SharedDockItem.m; sourceTree = SOURCE_ROOT; };
+		A42C412526BD4F5A0055F67C /* SharedDockItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharedDockItem.h; path = DockTilePlugIn/SharedDockItem.h; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		53D679D30FD6F0DB001688B3 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A42C411C26BD4A370055F67C /* AppKit.framework in Frameworks */,
+				A42C411A26BD4A260055F67C /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -112,10 +124,11 @@
 			children = (
 				41D5F1550FEE95CE004546AB /* README.rtf */,
 				29B97315FDCFA39411CA2CEA /* Sources */,
+				53D6795A0FD6EF91001688B3 /* DockTilePlugin */,
+				A42C411D26BD4EFB0055F67C /* Shared */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
-				53D6795A0FD6EF91001688B3 /* DockTilePlugin */,
 			);
 			name = TrackIt;
 			sourceTree = "<group>";
@@ -135,6 +148,7 @@
 			isa = PBXGroup;
 			children = (
 				53FE44180FD71991007FBB65 /* icon.icns */,
+				A42C412226BD4F1D0055F67C /* icon2.icns */,
 				536F14110D33E1A200B2806D /* Credits.rtf */,
 				8D1107310486CEB800E47090 /* DockTile.ObjC-Info.plist */,
 				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
@@ -146,6 +160,8 @@
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				A42C411B26BD4A370055F67C /* AppKit.framework */,
+				A42C411926BD4A260055F67C /* Foundation.framework */,
 				1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
 				1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
 			);
@@ -162,6 +178,15 @@
 			name = DockTilePlugin;
 			sourceTree = "<group>";
 		};
+		A42C411D26BD4EFB0055F67C /* Shared */ = {
+			isa = PBXGroup;
+			children = (
+				A42C412526BD4F5A0055F67C /* SharedDockItem.h */,
+				A42C412426BD4F5A0055F67C /* SharedDockItem.m */,
+			);
+			path = Shared;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -244,6 +269,7 @@
 				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
 				536F14130D33E1A200B2806D /* Credits.rtf in Resources */,
 				53FE44190FD71991007FBB65 /* icon.icns in Resources */,
+				A42C412326BD4F1D0055F67C /* icon2.icns in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -254,6 +280,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A42C412726BD4F5A0055F67C /* SharedDockItem.m in Sources */,
 				53D67A8F0FD6F773001688B3 /* DockTilePlugIn.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -264,6 +291,7 @@
 			files = (
 				8D11072D0486CEB800E47090 /* main.m in Sources */,
 				53CC47720ABB251700F70973 /* DockTileAppDelegate.m in Sources */,
+				A42C412626BD4F5A0055F67C /* SharedDockItem.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -308,24 +336,15 @@
 		53D679D70FD6F0DC001688B3 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
 				INFOPLIST_FILE = "DockTilePlugIn/DockTile.ObjC.PlugIn-Info.plist";
 				INSTALL_PATH = "$(LOCAL_DEVELOPER_DIR)/Demos";
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				OTHER_LDFLAGS = (
-					"-framework",
-					Foundation,
-					"-framework",
-					AppKit,
-				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.apple.samplecode.DockTilePlugIn;
 				PRODUCT_NAME = DockTile.ObjC;
 				WRAPPER_EXTENSION = docktileplugin;
@@ -335,22 +354,13 @@
 		53D679D80FD6F0DC001688B3 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
 				INFOPLIST_FILE = "DockTilePlugIn/DockTile.ObjC.PlugIn-Info.plist";
 				INSTALL_PATH = "$(LOCAL_DEVELOPER_DIR)/Demos";
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				OTHER_LDFLAGS = (
-					"-framework",
-					Foundation,
-					"-framework",
-					AppKit,
-				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.apple.samplecode.DockTilePlugIn;
 				PRODUCT_NAME = DockTile.ObjC;
 				WRAPPER_EXTENSION = docktileplugin;
@@ -366,12 +376,10 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREFIX_HEADER = Prefix.pch;
 				INFOPLIST_FILE = "DockTile.ObjC-Info.plist";
 				INSTALL_PATH = "$(LOCAL_DEVELOPER_DIR)/Demos";
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.apple.examples.DockTile.ObjC.App;
 				PRODUCT_NAME = DockTile.ObjC;
 				WRAPPER_EXTENSION = app;
@@ -386,11 +394,9 @@
 				CODE_SIGN_IDENTITY = "-";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
 				GCC_PREFIX_HEADER = Prefix.pch;
 				INFOPLIST_FILE = "DockTile.ObjC-Info.plist";
 				INSTALL_PATH = "$(LOCAL_DEVELOPER_DIR)/Demos";
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.apple.examples.DockTile.ObjC.App;
 				PRODUCT_NAME = DockTile.ObjC;
 				WRAPPER_EXTENSION = app;
@@ -400,7 +406,9 @@
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -421,13 +429,14 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
+				"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "DEBUG=1";
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 			};
@@ -436,7 +445,9 @@
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -462,7 +473,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				SDKROOT = macosx;
 			};
 			name = Release;

ObjC/DockTileAppDelegate.h

@@ -53,10 +53,11 @@
 
 */
 
-#include <Cocoa/Cocoa.h>
+#import <Cocoa/Cocoa.h>
 
 @interface DockTileAppDelegate : NSObject{
     NSMenu *dockMenu;
+    NSWindow *window;
 }
 
 @property NSInteger highScore;