Changeset 131 for trunk/Cocoa/Pester/Source/PSPreferencesController.m

Timestamp:

04/01/03 21:25:02 (21 years ago)

Author:

Nicholas Riley

Message:

PSPreferencesController.[hm]: Added support for registering hot keys;
not the most elegant thing in the world, but much better than it was
in the prototype. Triggered by +readPreferences.

NJRHotKeyField.[hm]: Replaced model components (wow, was that ever
dumb) by NJRHotKey reference, eliminating cumbersome archiving model.
Added accessors for hot key.

NJRHotKeyManager.[hm]: Ported Quentin Carnicelli's HotKeyCenter code
to use NJRHotKey, cleaned up, and removed reverse-engineered pre-10.2
support.

NJRHotKey.[hm]: New. Provides Cocoa-centric storage for
three-component hot keys, mapping from Cocoa to Carbon modifiers.

PSApplication.m: Reorganized. Added invocation of
+[PSPreferencesController readPreferences].

Fixes bug 29.

File:

• trunk/Cocoa/Pester/Source/PSPreferencesController.m (modified) (4 diffs)

trunk/Cocoa/Pester/Source/PSPreferencesController.m

@@ -8 +8 @@
 
 #import "PSPreferencesController.h"
+#import "PSApplication.h"
 #import "NJRHotKeyField.h"
+#import "NJRHotKey.h"
+#import "NJRHotKeyManager.h"
+
+// NSUserDefaults key
+static NSString * const PSSetAlarmHotKey = @"Pester set alarm system-wide keyboard shortcut";
+
+// NJRHotKeyManager shortcut identifier
+static NSString * const PSSetAlarmHotKeyShortcut = @"PSSetAlarmHotKeyShortcut";
 
 @implementation PSPreferencesController
+
++ (void)readPreferences;
+{
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    NJRHotKeyManager *hotKeyManager = [NJRHotKeyManager sharedManager];
+    NJRHotKey *hotKey = [[[NJRHotKey alloc] initWithPropertyList: [defaults dictionaryForKey: PSSetAlarmHotKey]] autorelease];
+
+    if (hotKey == nil) {
+        [hotKeyManager removeShortcutWithIdentifier: PSSetAlarmHotKeyShortcut];
+    } else {
+        if (![hotKeyManager addShortcutWithIdentifier: PSSetAlarmHotKeyShortcut
+                                               hotKey: hotKey
+                                               target: NSApp
+                                               action: @selector(orderFrontSetAlarmPanel:)]) {
+            NSRunAlertPanel(NSLocalizedString(@"Can't reserve alarm key equivalent", "Hot key set failure"),
+                            NSLocalizedString(@"Pester was unable to reserve the key equivalent %@. Please select another in Pester's Preferences, or click Clear to remove it.", "Hot key set failure"), nil, nil, nil, [hotKey keyGlyphs]);
+            [defaults removeObjectForKey: PSSetAlarmHotKey];
+            [(PSApplication *)NSApp performSelector: @selector(orderFrontPreferencesPanel:) withObject: self afterDelay: 0.1];
+        }
+    }
+}
 
 #pragma mark interface updating
@@ -24 +54 @@
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    [setAlarmHotKey setFromPropertyList: [defaults dictionaryForKey: @"Pester set alarm system-wide keyboard shortcut"]];
+    NJRHotKey *hotKey = [[NJRHotKey alloc] initWithPropertyList: [defaults dictionaryForKey: PSSetAlarmHotKey]];
+    [setAlarmHotKey setHotKey: hotKey];
+    [hotKey release];
 }
 
@@ -30 +62 @@
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    [defaults setObject: [setAlarmHotKey propertyListRepresentation] forKey: @"Pester set alarm system-wide keyboard shortcut"];
+    [defaults setObject: [[setAlarmHotKey hotKey] propertyListRepresentation] forKey: @"Pester set alarm system-wide keyboard shortcut"];
     [defaults synchronize];
+    [[self class] readPreferences];
 }
 
@@ -38 +71 @@
 - (id)init {
     if ( (self = [super initWithWindowNibName: @"Preferences"]) != nil) {
-        [self window]; // connect outlets
+        [[self window] center]; // connect outlets
         [self readFromPrefs];
         [self update];