Changeset 131 for trunk/Cocoa/Pester/Source/PSApplication.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/PSApplication.m (modified) (5 diffs)

trunk/Cocoa/Pester/Source/PSApplication.m

@@ -16 +16 @@
 #import "PSAlarms.h"
 #import "PSTimer.h"
+#import "NJRHotKey.h"
+
+#import <Carbon/Carbon.h>
 
 @implementation PSApplication
@@ -27 +30 @@
     [PSAlarms setUp];
     [self setDelegate: self];
+    [PSPreferencesController readPreferences];
     [super finishLaunching];
 }
+
+#pragma mark actions
 
 - (IBAction)showHelp:(id)sender;
@@ -55 +61 @@
 }
 
-#pragma mark preferences
-
 - (IBAction)orderFrontPreferencesPanel:(id)sender;
 {
@@ -64 +68 @@
     [preferencesController showWindow: self];
 }
+
+#pragma mark update timer
 
 - (void)_resetUpdateTimer;
@@ -108 +114 @@
         textOrigin = NSMakePoint(imageSize.width / 2 - textSize.width / 2,
                                  imageSize.height / 2 - textSize.height / 2);
-        frameRect = NSInsetRect(NSMakeRect(textOrigin.x, textOrigin.y, textSize.width, textSize.height),
-                                -4, -2);
+        frameRect = NSInsetRect(NSMakeRect(textOrigin.x, textOrigin.y, textSize.width, textSize.height), -4, -2);
         
         [tile lockFocus];