Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for Lightroom Classic CC on OSX #29

Merged
merged 3 commits into from
Nov 4, 2017
+25 −13
Merged

Added support for Lightroom Classic CC on OSX #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96a2454
Added new version of lightroom
cajames Nov 3, 2017
34ce997
New xcode build with Classic CC support
cajames Nov 3, 2017
5febbdc
Add the installer for the new version. Also updated readme
cajames Nov 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 10 additions & 6 deletions Build/VSCOKeys.app/Contents/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Binary file modified Build/VSCOKeys.app/Contents/MacOS/VSCOKeys
View file
Open in desktop
Binary file not shown.
Binary file modified Build/VSCOKeys.app/Contents/Resources/AboutWindow.nib
View file
Open in desktop
Binary file not shown.
Binary file modified Build/VSCOKeys.app/Contents/Resources/QuickWindow.nib
View file
Open in desktop
Binary file not shown.
Binary file modified Build/VSCOKeys.app/Contents/Resources/VSCOKeysActivator
View file
Open in desktop
Binary file not shown.
Binary file modified Build/VSCOKeys.app/Contents/Resources/en.lproj/MainMenu.nib
View file
Open in desktop
Binary file not shown.
Binary file added Build/vscokeys-2.0.1-osx-installer.app.zip
View file
Open in desktop
Binary file not shown.
13 changes: 9 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,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

Expand Down
1 change: 1 addition & 0 deletions VSCOKeys/VSCOKeys/Constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions VSCOKeys/VSCOKeys/KeyControl.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
Expand Down