aboutsummaryrefslogtreecommitdiffstats
path: root/Demo
diff options
context:
space:
mode:
authorTomáš Znamenáček2014-08-07 12:12:06 +0200
committerTomáš Znamenáček2015-01-07 15:42:22 +0100
commit118abba104a1eeabc5c449ac86e25a6d87f1954c (patch)
treed95879766a8a5decff97f7240edd09072dbef10a /Demo
parentbbf2f69da4253b9fc28bd622a3041622f064d22c (diff)
downloadMASShortcut-118abba104a1eeabc5c449ac86e25a6d87f1954c.tar.bz2
Added a shared binder instance singleton.
This adds a really simple API to set up some bindings without having to keep a binder instance around by hand. If somebody wants to, it’s not a problem to allocate a separate instance and have precise control over its lifetime.
Diffstat (limited to 'Demo')
-rw-r--r--Demo/AppDelegate.m17
1 files changed, 5 insertions, 12 deletions
diff --git a/Demo/AppDelegate.m b/Demo/AppDelegate.m
index 81b2661..d55d43c 100644
--- a/Demo/AppDelegate.m
+++ b/Demo/AppDelegate.m
@@ -4,20 +4,13 @@ NSString *const MASPreferenceKeyShortcut = @"MASDemoShortcut";
NSString *const MASPreferenceKeyShortcutEnabled = @"MASDemoShortcutEnabled";
NSString *const MASPreferenceKeyConstantShortcutEnabled = @"MASDemoConstantShortcutEnabled";
-@implementation AppDelegate {
- MASShortcutMonitor *_shortcutMonitor;
- MASShortcutBinder *_shortcutBinder;
-}
+@implementation AppDelegate
#pragma mark -
- (void)awakeFromNib
{
[super awakeFromNib];
-
- _shortcutBinder = [[MASShortcutBinder alloc] init];
- _shortcutMonitor = [MASShortcutMonitor sharedMonitor];
-
// Checkbox will enable and disable the shortcut view
[self.shortcutView bind:@"enabled" toObject:self withKeyPath:@"shortcutEnabled" options:nil];
}
@@ -62,14 +55,14 @@ NSString *const MASPreferenceKeyConstantShortcutEnabled = @"MASDemoConstantShort
- (void)resetShortcutRegistration
{
if (self.shortcutEnabled) {
- [_shortcutBinder bindShortcutWithDefaultsKey:MASPreferenceKeyShortcut toAction:^{
+ [[MASShortcutBinder sharedBinder] bindShortcutWithDefaultsKey:MASPreferenceKeyShortcut toAction:^{
[[NSAlert alertWithMessageText:NSLocalizedString(@"Global hotkey has been pressed.", @"Alert message for custom shortcut")
defaultButton:NSLocalizedString(@"OK", @"Default button for the alert on custom shortcut")
alternateButton:nil otherButton:nil informativeTextWithFormat:@""] runModal];
}];
}
else {
- [_shortcutBinder breakBindingWithDefaultsKey:MASPreferenceKeyShortcut];
+ [[MASShortcutBinder sharedBinder] breakBindingWithDefaultsKey:MASPreferenceKeyShortcut];
}
}
@@ -92,14 +85,14 @@ NSString *const MASPreferenceKeyConstantShortcutEnabled = @"MASDemoConstantShort
{
MASShortcut *shortcut = [MASShortcut shortcutWithKeyCode:kVK_F2 modifierFlags:NSCommandKeyMask];
if (self.constantShortcutEnabled) {
- [_shortcutMonitor registerShortcut:shortcut withAction:^{
+ [[MASShortcutMonitor sharedMonitor] registerShortcut:shortcut withAction:^{
[[NSAlert alertWithMessageText:NSLocalizedString(@"⌘F2 has been pressed.", @"Alert message for constant shortcut")
defaultButton:NSLocalizedString(@"OK", @"Default button for the alert on constant shortcut")
alternateButton:nil otherButton:nil informativeTextWithFormat:@""] runModal];
}];
}
else {
- [_shortcutMonitor unregisterShortcut:shortcut];
+ [[MASShortcutMonitor sharedMonitor] unregisterShortcut:shortcut];
}
}