Changeset 53 for trunk/Cocoa/Pester/Source/PSSpeechAlert.m

Timestamp:

01/02/03 05:30:03 (21 years ago)

Author:

Nicholas Riley

Message:

Updated for Pester 1.1a5 (very limited release).

Pester 1.1a4 was never released.

Location:

trunk/Cocoa/Pester/Source

Files:

• . (modified) (1 prop)
• PSSpeechAlert.m (modified) (4 diffs)

trunk/Cocoa/Pester/Source

@@ -1 +1 @@
 build
+.gdb_history

@@ -1 +1 @@
 build
+.gdb_history

trunk/Cocoa/Pester/Source/PSSpeechAlert.m

@@ -4 +4 @@
 //
 //  Created by Nicholas Riley on Sat Oct 26 2002.
-//  Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//  Copyright (c) 2002 Nicholas Riley. All rights reserved.
 //
 
 #import "PSSpeechAlert.h"
 #import "PSAlarmAlertController.h"
+#import "NSDictionary-NJRExtensions.h"
+#import "SUSpeaker.h"
+
+// property list keys
+static NSString * const PLAlertVoice = @"voice"; // NSString
 
 @implementation PSSpeechAlert
@@ -20 +25 @@
 {
     if ( (self = [super init]) != nil) {
-        voice = aVoice;
+        voice = [aVoice retain];
     }
     return self;
@@ -33 +38 @@
 }
 
+- (NSString *)voice;
+{
+    return voice;
+}
+
 - (void)_stopSpeaking:(NSNotification *)notification;
 {
-    [speaker stopSpeaking];
-    // don't release here, we'll still get the didFinishSpeaking: message as a delegate
+    [speaker stopSpeaking]; // triggers didFinishSpeaking:
 }
 
-- (void)triggerForAlarm:(PSAlarm *)alarm;
+- (void)triggerForAlarm:(PSAlarm *)anAlarm;
 {
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(_stopSpeaking:) name: PSAlarmAlertStopNotification object: nil];
     
     if ( (speaker = [[SUSpeaker alloc] init]) == nil) return;
+    alarm = anAlarm;
     [speaker setDelegate: self];
     [speaker setVoice: [[SUSpeaker voiceNames] indexOfObject: voice] + 1];
     [speaker speakText: [alarm message]];
-    
-    [self retain];
+}
+
+- (NSAttributedString *)actionDescription;
+{
+    NSMutableAttributedString *string = [[@"Speak message with voice " small] mutableCopy];
+    [string appendAttributedString: [voice underlined]];
+    return [string autorelease];
+}
+
+#pragma mark property list serialization (Pester 1.1)
+
+- (NSDictionary *)propertyListRepresentation;
+{
+    NSMutableDictionary *plAlert = [[super propertyListRepresentation] mutableCopy];
+    [plAlert setObject: voice forKey: PLAlertVoice];
+    return [plAlert autorelease];
+}
+
+- (id)initWithPropertyList:(NSDictionary *)dict;
+{
+    if ( (self = [self init]) != nil) {
+        voice = [dict objectForRequiredKey: PLAlertVoice];
+    }
+    return self;
 }
 
@@ -55 +87 @@
 @implementation PSSpeechAlert (SUSpeakerDelegate)
 
-- (void)didFinishSpeaking:(SUSpeaker*)speaker;
+- (void)didFinishSpeaking:(SUSpeaker *)aSpeaker;
 {
-    [self release];
+    [self completedForAlarm: alarm];
+    [speaker release]; speaker = nil;
 }
 

@@ -1 +1 @@
 build
+.gdb_history