diff --git a/.gitignore b/.gitignore index d160d57..e84b5d8 100644 --- a/.gitignore +++ b/.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 \ No newline at end of file +/Tools/VSCOKeys-win.xml.backup +*.p12 \ No newline at end of file diff --git a/Build/VSCOKeys.app/Contents/Info.plist b/Build/VSCOKeys.app/Contents/Info.plist index 6bfd928..83b5d51 100644 --- a/Build/VSCOKeys.app/Contents/Info.plist +++ b/Build/VSCOKeys.app/Contents/Info.plist @@ -5,7 +5,7 @@ ATSApplicationFontsPath Font BuildMachineOSBuild - 14E46 + 16G29 CFBundleDevelopmentRegion en CFBundleDocumentTypes @@ -46,22 +46,26 @@ 2.0 CFBundleSignature ???? + CFBundleSupportedPlatforms + + MacOSX + CFBundleVersion 2.0 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 6E35b + 9B55 DTPlatformVersion GM DTSDKBuild - 14D125 + 17B41 DTSDKName - macosx10.10 + macosx10.13 DTXcode - 0640 + 0910 DTXcodeBuild - 6E35b + 9B55 LSMinimumSystemVersion 10.6 LSUIElement diff --git a/Build/VSCOKeys.app/Contents/MacOS/VSCOKeys b/Build/VSCOKeys.app/Contents/MacOS/VSCOKeys index feef3e1..5c58a0d 100755 Binary files a/Build/VSCOKeys.app/Contents/MacOS/VSCOKeys and b/Build/VSCOKeys.app/Contents/MacOS/VSCOKeys differ diff --git a/Build/VSCOKeys.app/Contents/Resources/AboutWindow.nib b/Build/VSCOKeys.app/Contents/Resources/AboutWindow.nib index f491da4..812600d 100644 Binary files a/Build/VSCOKeys.app/Contents/Resources/AboutWindow.nib and b/Build/VSCOKeys.app/Contents/Resources/AboutWindow.nib differ diff --git a/Build/VSCOKeys.app/Contents/Resources/QuickWindow.nib b/Build/VSCOKeys.app/Contents/Resources/QuickWindow.nib index 092ef8a..6c5c946 100644 Binary files a/Build/VSCOKeys.app/Contents/Resources/QuickWindow.nib and b/Build/VSCOKeys.app/Contents/Resources/QuickWindow.nib differ diff --git a/Build/VSCOKeys.app/Contents/Resources/VSCOKeysActivator b/Build/VSCOKeys.app/Contents/Resources/VSCOKeysActivator index b9c36ae..ae3e28d 100755 Binary files a/Build/VSCOKeys.app/Contents/Resources/VSCOKeysActivator and b/Build/VSCOKeys.app/Contents/Resources/VSCOKeysActivator differ diff --git a/Build/VSCOKeys.app/Contents/Resources/en.lproj/MainMenu.nib b/Build/VSCOKeys.app/Contents/Resources/en.lproj/MainMenu.nib index 2e7289f..39ed4a8 100644 Binary files a/Build/VSCOKeys.app/Contents/Resources/en.lproj/MainMenu.nib and b/Build/VSCOKeys.app/Contents/Resources/en.lproj/MainMenu.nib differ diff --git a/Build/vscokeys-2.0.1-osx-installer.app.zip b/Build/vscokeys-2.0.1-osx-installer.app.zip new file mode 100644 index 0000000..4563b6a Binary files /dev/null and b/Build/vscokeys-2.0.1-osx-installer.app.zip differ diff --git a/README.md b/README.md index f95c5f4..d76cc16 100644 --- a/README.md +++ b/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 diff --git a/VSCOKeys/VSCOKeys/Constants.h b/VSCOKeys/VSCOKeys/Constants.h index 4fabddc..e661adc 100644 --- a/VSCOKeys/VSCOKeys/Constants.h +++ b/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 diff --git a/VSCOKeys/VSCOKeys/KeyControl.m b/VSCOKeys/VSCOKeys/KeyControl.m index e84e9e5..f4e828a 100644 --- a/VSCOKeys/VSCOKeys/KeyControl.m +++ b/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; }