Merge pull request #29 from cajames/master

Added support for Lightroom Classic CC on OSX

.gitignore

@@ -12,4 +12,5 @@ VSCOKeys-win/VSCOKeys/obj
 VSCOKeys-win/NotifyIconWpf/bin
 VSCOKeys-win/NotifyIconWpf/obj
 /VSCOKeys-win/VSCOKeys/VSCOKeys.csproj.user
-/Tools/VSCOKeys-win.xml.backup
+/Tools/VSCOKeys-win.xml.backup
+*.p12

Build/VSCOKeys.app/Contents/Info.plist

@@ -5,7 +5,7 @@
 	<key>ATSApplicationFontsPath</key>
 	<string>Font</string>
 	<key>BuildMachineOSBuild</key>
-	<string>14E46</string>
+	<string>16G29</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDocumentTypes</key>
@@ -46,22 +46,26 @@
 	<string>2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>2.0</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>6E35b</string>
+	<string>9B55</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>14D125</string>
+	<string>17B41</string>
 	<key>DTSDKName</key>
-	<string>macosx10.10</string>
+	<string>macosx10.13</string>
 	<key>DTXcode</key>
-	<string>0640</string>
+	<string>0910</string>
 	<key>DTXcodeBuild</key>
-	<string>6E35b</string>
+	<string>9B55</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.6</string>
 	<key>LSUIElement</key>

README.md

@@ -18,10 +18,15 @@ in [LICENSE](LICENSE).
 
 ## Installing
 
-Go to http://vsco.github.io/keys/ and click the "Download for Windows" or
-"Download for Mac" link, depending on your platform. Unzip the downloaded
-file and double-click the installer. Follow the prompts and it will be
-installed.
+Go to the Releases page, and download the `.zip` file for the [latest release](https://github.com/cajames/keys/releases/latest).
+Unzip the downloaded file and double-click the installer. Follow the prompts and it will be installed.
+
+**On Mac**
+After installing, please be sure to add the `VSCOKeys.app` to have accessibility privileges.
+```
+System Preferences -> Security & Privacy -> Privacy -> Accessibility.
+// Add VSCOKeys.app to that list
+```
 
 ## Contributing
 

VSCOKeys/VSCOKeys/Constants.h

@@ -56,6 +56,7 @@
 #define LIGHTROOM_BUNDLE_LR4 @"com.adobe.Lightroom4"
 #define LIGHTROOM_BUNDLE_LR5 @"com.adobe.Lightroom5"
 #define LIGHTROOM_BUNDLE_LR6 @"com.adobe.Lightroom6"
+#define LIGHTROOM_BUNDLE_LR7 @"com.adobe.LightroomClassicCC7"
 
 #define STATUSBAR_UPDATE_RATE 0.25
 #define APP_RUNNING_UPDATE_RATE 1

VSCOKeys/VSCOKeys/KeyControl.m

@@ -550,7 +550,7 @@ - (void)deletePdf:(NSString*)uuid
 
 - (void)initAppList
 {
-    self.appIdList = [NSArray arrayWithObjects:LIGHTROOM_BUNDLE_LR3,LIGHTROOM_BUNDLE_LR4,LIGHTROOM_BUNDLE_LR5,LIGHTROOM_BUNDLE_LR6, nil];
+    self.appIdList = [NSArray arrayWithObjects:LIGHTROOM_BUNDLE_LR3,LIGHTROOM_BUNDLE_LR4,LIGHTROOM_BUNDLE_LR5,LIGHTROOM_BUNDLE_LR6,LIGHTROOM_BUNDLE_LR7, nil];
 }
 
 - (NSRunningApplication*)getLRRunningInstance
@@ -614,7 +614,8 @@ - (NSString *)getLRVersion
 
     if ([lr.bundleIdentifier caseInsensitiveCompare:LIGHTROOM_BUNDLE_LR4] == NSOrderedSame ||
         [lr.bundleIdentifier caseInsensitiveCompare:LIGHTROOM_BUNDLE_LR5] == NSOrderedSame ||
-        [lr.bundleIdentifier caseInsensitiveCompare:LIGHTROOM_BUNDLE_LR6] == NSOrderedSame)
+        [lr.bundleIdentifier caseInsensitiveCompare:LIGHTROOM_BUNDLE_LR6] == NSOrderedSame ||
+        [lr.bundleIdentifier caseInsensitiveCompare:LIGHTROOM_BUNDLE_LR7] == NSOrderedSame)
     {
         return LRVERSION_LR4;
     }