Merge pull request #52 from starkos/flat-button-style

Flat button style

MASShortcut+Monitoring.m

@@ -1,9 +1,9 @@
 #import "MASShortcut+Monitoring.h"
 
-NSMutableDictionary *MASRegisteredHotKeys();
-BOOL InstallCommonEventHandler();
+NSMutableDictionary *MASRegisteredHotKeys(void);
+BOOL InstallCommonEventHandler(void);
 BOOL InstallHotkeyWithShortcut(MASShortcut *shortcut, UInt32 *outCarbonHotKeyID, EventHotKeyRef *outCarbonHotKey);
-void UninstallEventHandler();
+void UninstallEventHandler(void);
 
 #pragma mark -
 

MASShortcut+UserDefaults.m

@@ -25,7 +25,7 @@
     return shared;
 }
 
-+ (void)registerGlobalShortcutWithUserDefaultsKey:(NSString *)userDefaultsKey handler:(void (^)())handler;
++ (void)registerGlobalShortcutWithUserDefaultsKey:(NSString *)userDefaultsKey handler:(void (^)())handler
 {
     MASShortcutUserDefaultsHotKey *hotKey = [[MASShortcutUserDefaultsHotKey alloc] initWithUserDefaultsKey:userDefaultsKey handler:handler];
     [[self registeredUserDefaultsHotKeys] setObject:hotKey forKey:userDefaultsKey];
@@ -54,12 +54,6 @@
     NSString *_observableKeyPath;
 }
 
-@synthesize monitor = _monitor;
-@synthesize handler = _handler;
-@synthesize userDefaultsKey = _userDefaultsKey;
-
-#pragma mark -
-
 void *MASShortcutUserDefaultsContext = &MASShortcutUserDefaultsContext;
 
 - (id)initWithUserDefaultsKey:(NSString *)userDefaultsKey handler:(void (^)())handler

MASShortcut.h

@@ -1,4 +1,5 @@
 #import <Carbon/Carbon.h>
+#import <AppKit/AppKit.h>
 
 #define MASShortcutChar(char) [NSString stringWithFormat:@"%C", (unsigned short)(char)]
 #define MASShortcutClear(flags) (flags & (NSControlKeyMask | NSShiftKeyMask | NSAlternateKeyMask | NSCommandKeyMask))
@@ -30,7 +31,7 @@ enum {
 	kMASShortcutGlyphSoutheastArrow = 0x2198,
 } MASShortcutGlyph;
 
-@interface MASShortcut : NSObject <NSCoding>
+@interface MASShortcut : NSObject <NSSecureCoding>
 
 @property (nonatomic) NSUInteger keyCode;
 @property (nonatomic) NSUInteger modifierFlags;

MASShortcut.m

@@ -13,6 +13,11 @@ NSString *const MASShortcutModifierFlags = @"ModifierFlags";
 
 #pragma mark -
 
++ (BOOL)supportsSecureCoding
+{
+    return YES;
+}
+
 - (void)encodeWithCoder:(NSCoder *)coder
 {
     [coder encodeInteger:(self.keyCode != NSNotFound ? (NSInteger)self.keyCode : - 1) forKey:MASShortcutKeyCode];
@@ -189,7 +194,7 @@ NSString *const MASShortcutModifierFlags = @"ModifierFlags";
             UniCharCount length = 0;
             UniChar  chars[256] = { 0 };
             UInt32 deadKeyState = 0;
-            error = UCKeyTranslate(layoutData, self.keyCode, kUCKeyActionDisplay, 0, // No modifiers
+            error = UCKeyTranslate(layoutData, (UInt16)self.keyCode, kUCKeyActionDisplay, 0, // No modifiers
                                    LMGetKbdType(), kUCKeyTranslateNoDeadKeysMask, &deadKeyState,
                                    sizeof(chars) / sizeof(UniChar), &length, chars);
             keystroke = ((error == noErr) && length ? [NSString stringWithCharacters:chars length:length] : @"");
@@ -315,6 +320,7 @@ BOOL MASShortcutAllowsAnyHotkeyWithOptionModifier = NO;
 - (BOOL)isTakenError:(NSError **)outError
 {
 	CFArrayRef globalHotKeys;
+	BOOL isTaken = NO;
 	if (CopySymbolicHotKeys(&globalHotKeys) == noErr) {
 
         // Enumerate all global hotkeys and check if any of them matches current shortcut
@@ -322,9 +328,11 @@ BOOL MASShortcutAllowsAnyHotkeyWithOptionModifier = NO;
             CFDictionaryRef hotKeyInfo = CFArrayGetValueAtIndex(globalHotKeys, i);
             CFNumberRef code = CFDictionaryGetValue(hotKeyInfo, kHISymbolicHotKeyCode);
             CFNumberRef flags = CFDictionaryGetValue(hotKeyInfo, kHISymbolicHotKeyModifiers);
+            CFNumberRef enabled = CFDictionaryGetValue(hotKeyInfo, kHISymbolicHotKeyEnabled);
 
             if (([(__bridge NSNumber *)code unsignedIntegerValue] == self.keyCode) &&
-                ([(__bridge NSNumber *)flags unsignedIntegerValue] == self.carbonFlags)) {
+                ([(__bridge NSNumber *)flags unsignedIntegerValue] == self.carbonFlags) &&
+                ([(__bridge NSNumber *)enabled boolValue])) {
 
                 if (outError) {
                     NSString *description = NSLocalizedString(@"This combination cannot be used because it is already used by a system-wide "
@@ -334,12 +342,13 @@ BOOL MASShortcutAllowsAnyHotkeyWithOptionModifier = NO;
                     NSDictionary *info = [NSDictionary dictionaryWithObject:description forKey:NSLocalizedDescriptionKey];
                     *outError = [NSError errorWithDomain:NSCocoaErrorDomain code:0 userInfo:info];
                 }
-                return YES;
+                isTaken = YES;
+                break;
             }
         }
         CFRelease(globalHotKeys);
     }
-    return [self isKeyEquivalent:self.keyCodeStringForKeyEquivalent flags:self.modifierFlags takenInMenu:[NSApp mainMenu] error:outError];
+    return (isTaken || [self isKeyEquivalent:self.keyCodeStringForKeyEquivalent flags:self.modifierFlags takenInMenu:[NSApp mainMenu] error:outError]);
 }
 
 @end

MASShortcut.podspec

@@ -0,0 +1,14 @@
+Pod::Spec.new do |s|
+  s.platform              = :osx
+  s.osx.deployment_target = "10.7"
+  s.name	              = 'MASShortcut'
+  s.version               = '1.3.1'
+  s.summary               = 'Modern framework for managing global keyboard shortcuts compatible with Mac App Store'
+  s.homepage              = 'https://github.com/shpakovski/MASShortcut'
+  s.authors               = { 'Vadim Shpakovski' => 'vadim@shpakovski.com' }
+  s.license               = 'BSD 2-clause'
+  s.source                = { :git => 'https://github.com/shpakovski/MASShortcut.git', :tag => '1.3.1' }
+  s.source_files          = '*.{h,m}'
+  s.osx.frameworks        = 'Carbon', 'AppKit'
+  s.requires_arc          = true
+end

MASShortcutView+UserDefaults.m

@@ -45,11 +45,6 @@ void *MASAssociatedDefaultsObserver = &MASAssociatedDefaultsObserver;
     BOOL _internalShortcutChange;
 }
 
-@synthesize userDefaultsKey = _userDefaultsKey;
-@synthesize shortcutView = _shortcutView;
-
-#pragma mark -
-
 - (id)initWithShortcutView:(MASShortcutView *)shortcutView userDefaultsKey:(NSString *)userDefaultsKey
 {
     self = [super init];

MASShortcutView.h

@@ -1,9 +1,12 @@
+#import <AppKit/AppKit.h>
+
 @class MASShortcut;
 
 typedef enum {
     MASShortcutViewAppearanceDefault = 0,  // Height = 19 px
     MASShortcutViewAppearanceTexturedRect, // Height = 25 px
-    MASShortcutViewAppearanceRounded       // Height = 43 px
+    MASShortcutViewAppearanceRounded,      // Height = 43 px
+    MASShortcutViewAppearanceFlat
 } MASShortcutViewAppearance;
 
 @interface MASShortcutView : NSView
@@ -14,4 +17,7 @@ typedef enum {
 @property (nonatomic, copy) void (^shortcutValueChange)(MASShortcutView *sender);
 @property (nonatomic) MASShortcutViewAppearance appearance;
 
+/// Returns custom class for drawing control.
++ (Class)shortcutCellClass;
+
 @end

MASShortcutView.m

@@ -29,22 +29,42 @@
 @synthesize shortcutPlaceholder = _shortcutPlaceholder;
 @synthesize shortcutValueChange = _shortcutValueChange;
 @synthesize recording = _recording;
+@synthesize appearance = _appearance;
 
 #pragma mark -
 
++ (Class)shortcutCellClass
+{
+    return [NSButtonCell class];
+}
+
 - (id)initWithFrame:(CGRect)frameRect
 {
     self = [super initWithFrame:frameRect];
     if (self) {
-        _shortcutCell = [[NSButtonCell alloc] init];
-        _shortcutCell.buttonType = NSPushOnPushOffButton;
-        _shortcutCell.font = [[NSFontManager sharedFontManager] convertFont:_shortcutCell.font toSize:BUTTON_FONT_SIZE];
-        _enabled = YES;
-        [self resetShortcutCellStyle];
+        [self commonInit];
     }
     return self;
 }
 
+- (id)initWithCoder:(NSCoder *)coder
+{
+    self = [super initWithCoder:coder];
+    if (self) {
+        [self commonInit];
+    }
+    return self;
+}
+
+- (void)commonInit
+{
+    _shortcutCell = [[[self.class shortcutCellClass] alloc] init];
+    _shortcutCell.buttonType = NSPushOnPushOffButton;
+    _shortcutCell.font = [[NSFontManager sharedFontManager] convertFont:_shortcutCell.font toSize:BUTTON_FONT_SIZE];
+    _enabled = YES;
+    [self resetShortcutCellStyle];
+}
+
 - (void)dealloc
 {
     [self activateEventMonitoring:NO];
@@ -87,6 +107,12 @@
             _shortcutCell.bezelStyle = NSRoundedBezelStyle;
             break;
         }
+        case MASShortcutViewAppearanceFlat: {
+            self.wantsLayer = YES;
+            _shortcutCell.backgroundColor = [NSColor clearColor];
+            _shortcutCell.bordered = NO;
+            break;
+        }
     }
 }
 
@@ -156,6 +182,10 @@
             [_shortcutCell drawWithFrame:CGRectOffset(frame, 0.0, 1.0) inView:self];
             break;
         }
+        case MASShortcutViewAppearanceFlat: {
+            [_shortcutCell drawWithFrame:frame inView:self];
+            break;
+        }
     }
 }
 
@@ -207,6 +237,7 @@
     switch (self.appearance) {
         case MASShortcutViewAppearanceTexturedRect: hintButtonWidth += 2.0; break;
         case MASShortcutViewAppearanceRounded: hintButtonWidth += 3.0; break;
+        case MASShortcutViewAppearanceFlat: hintButtonWidth -= 8.0 - (_shortcutCell.font.pointSize - BUTTON_FONT_SIZE); break;
         default: break;
     }
     CGRectDivide(self.bounds, &hintRect, &shortcutRect, hintButtonWidth, CGRectMaxXEdge);
@@ -353,7 +384,7 @@ void *kUserDataHint = &kUserDataHint;
                 weakSelf.recording = NO;
                 event = nil;
             }
-            else if (shortcut.keyCode == kVK_Escape) {
+            else if (shortcut.keyCode == kVK_Escape && !shortcut.modifierFlags) {
                 // Cancel recording
                 weakSelf.recording = NO;
                 event = nil;
@@ -374,9 +405,13 @@ void *kUserDataHint = &kUserDataHint;
                             [weakSelf activateEventMonitoring:NO];
                             NSString *format = NSLocalizedString(@"The key combination %@ cannot be used",
                                                                  @"Title for alert when shortcut is already used");
-                            NSRunCriticalAlertPanel([NSString stringWithFormat:format, shortcut], error.localizedDescription,
-                                                    NSLocalizedString(@"OK", @"Alert button when shortcut is already used"),
-                                                    nil, nil);
+                            NSAlert *alert = [[NSAlert alloc] init];
+                            alert.alertStyle = NSCriticalAlertStyle;
+                            alert.informativeText = [NSString stringWithFormat:format, shortcut];
+                            alert.messageText = error.localizedDescription;
+                            [alert addButtonWithTitle:NSLocalizedString(@"OK", @"Alert button when shortcut is already used")];
+                            
+                            [alert runModal];
                             weakSelf.shortcutPlaceholder = nil;
                             [weakSelf activateResignObserver:YES];
                             [weakSelf activateEventMonitoring:YES];

README.md

@@ -9,7 +9,7 @@ The project MASShortcut introduces modern API and user interface for recording,
 I hope, it is really easy:
 
 ```objective-c
-// Drop a custom view into XIB and set its class to MASShortcutView
+// Drop a custom view into XIB, set its class to MASShortcutView and its height to 19. If you select another appearance style look up the correct values in MASShortcutView.h
 @property (nonatomic, weak) IBOutlet MASShortcutView *shortcutView;
 	
 // Think up a preference key to store a global shortcut between launches
@@ -64,7 +64,7 @@ _observableKeyPath = [@"values." stringByAppendingString:kPreferenceGlobalShortc
 
 # Non-ARC Version
 
-If you like retain/release, please check out these forks: [heardrwt/MASShortcut](https://github.com/heardrwt/MASShortcut) and [chendo/MASShortcut](https://github.com/chendo/MASShortcut).
+If you like retain/release, please check out these forks: [heardrwt/MASShortcut](https://github.com/heardrwt/MASShortcut) and [chendo/MASShortcut](https://github.com/chendo/MASShortcut). However, the preferred way is to enable the `-fobjc-arc` in Xcode source options.
 
 # Copyright