diff options
| -rw-r--r-- | Demo/AppDelegate.m | 4 | ||||
| -rw-r--r-- | Demo/MainMenu.xib | 14 | ||||
| -rw-r--r-- | MASShortcut.xcodeproj/project.pbxproj | 6 |
3 files changed, 13 insertions, 11 deletions
diff --git a/Demo/AppDelegate.m b/Demo/AppDelegate.m index fd8d307..24d2c81 100644 --- a/Demo/AppDelegate.m +++ b/Demo/AppDelegate.m @@ -43,7 +43,7 @@ static void *MASObservingContext = &MASObservingContext; context:MASObservingContext]; } -- (void) playShortcutFeedback +- (void)playShortcutFeedback { [[NSSound soundNamed:@"Ping"] play]; [_feedbackTextField setStringValue:@"Shortcut pressed!"]; @@ -83,7 +83,7 @@ static void *MASObservingContext = &MASObservingContext; - (void) setHardcodedShortcutEnabled: (BOOL) enabled { - MASShortcut *shortcut = [MASShortcut shortcutWithKeyCode:kVK_ANSI_Keypad2 modifierFlags:NSCommandKeyMask]; + MASShortcut *shortcut = [MASShortcut shortcutWithKeyCode:kVK_F2 modifierFlags:NSCommandKeyMask]; if (enabled) { [[MASShortcutMonitor sharedMonitor] registerShortcut:shortcut withAction:^{ [self playShortcutFeedback]; diff --git a/Demo/MainMenu.xib b/Demo/MainMenu.xib index 3d99587..a04814d 100644 --- a/Demo/MainMenu.xib +++ b/Demo/MainMenu.xib @@ -649,10 +649,10 @@ </menu> <window title="Demo" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="DemoWindow" animationBehavior="default" id="371"> <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/> - <rect key="contentRect" x="335" y="390" width="385" height="129"/> - <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/> + <rect key="contentRect" x="335" y="390" width="393" height="129"/> + <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/> <view key="contentView" id="372"> - <rect key="frame" x="0.0" y="0.0" width="385" height="129"/> + <rect key="frame" x="0.0" y="0.0" width="393" height="129"/> <autoresizingMask key="autoresizingMask"/> <subviews> <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="536" customClass="MASShortcutView"> @@ -685,8 +685,8 @@ </textFieldCell> </textField> <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="F4r-KM-wn9"> - <rect key="frame" x="140" y="43" width="227" height="18"/> - <buttonCell key="cell" type="check" title="Enable hard-coded shortcut (⌘2)" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="7gv-jN-44g"> + <rect key="frame" x="140" y="43" width="235" height="18"/> + <buttonCell key="cell" type="check" title="Enable hard-coded shortcut (⌘F2)" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="7gv-jN-44g"> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <font key="font" metaFont="system"/> </buttonCell> @@ -706,13 +706,13 @@ <rect key="frame" x="140" y="20" width="211" height="17"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" placeholderString="Press a shortcut to see feedback" id="Ckx-v7-e6x"> <font key="font" metaFont="system"/> - <color key="textColor" red="1" green="0.14901961389999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> + <color key="textColor" red="0.37647062540054321" green="0.85098046064376831" blue="0.17647059261798859" alpha="1" colorSpace="deviceRGB"/> <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> </subviews> </view> - <point key="canvasLocation" x="348.5" y="367.5"/> + <point key="canvasLocation" x="352.5" y="367.5"/> </window> <customObject id="494" customClass="AppDelegate"> <connections> diff --git a/MASShortcut.xcodeproj/project.pbxproj b/MASShortcut.xcodeproj/project.pbxproj index aeb0aa3..2ab08a8 100644 --- a/MASShortcut.xcodeproj/project.pbxproj +++ b/MASShortcut.xcodeproj/project.pbxproj @@ -17,7 +17,7 @@ 0D827D711990D6110010B8EF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D827D6D1990D6110010B8EF /* main.m */; }; 0D827D721990D6110010B8EF /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0D827D6E1990D6110010B8EF /* MainMenu.xib */; }; 0D827D731990D6590010B8EF /* MASShortcut.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D827CD31990D4420010B8EF /* MASShortcut.framework */; }; - 0D827D751990D6A60010B8EF /* MASShortcut.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 0D827CD31990D4420010B8EF /* MASShortcut.framework */; }; + 0D827D751990D6A60010B8EF /* MASShortcut.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 0D827CD31990D4420010B8EF /* MASShortcut.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 0D827D771990F81E0010B8EF /* Shortcut.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D827D761990F81E0010B8EF /* Shortcut.h */; settings = {ATTRIBUTES = (Public, ); }; }; 0D827D9419910B740010B8EF /* MASShortcutTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D827D9319910B740010B8EF /* MASShortcutTests.m */; }; 0D827D9519910C1E0010B8EF /* MASShortcut.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D827CD31990D4420010B8EF /* MASShortcut.framework */; }; @@ -334,7 +334,7 @@ 0D827CCA1990D4420010B8EF /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0610; ORGANIZATIONNAME = "Vadim Shpakovski"; TargetAttributes = { 0D827D8219910AFF0010B8EF = { @@ -572,6 +572,7 @@ 0D827D9019910AFF0010B8EF /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_FRAMEWORKS_DIR)", "$(inherited)", @@ -591,6 +592,7 @@ 0D827D9119910AFF0010B8EF /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_FRAMEWORKS_DIR)", "$(inherited)", |