Index: trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/classes.nib (revision 550)
+++ trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/classes.nib (revision 551)
@@ -17,4 +17,12 @@
SUPERCLASS
NSPopUpButton
+
+
+ CLASS
+ NSDisclosureButtonCell
+ LANGUAGE
+ ObjC
+ SUPERCLASS
+ NSButtonCell
@@ -119,12 +127,4 @@
- CLASS
- NSDisclosureButtonCell
- LANGUAGE
- ObjC
- SUPERCLASS
- NSButtonCell
-
-
ACTIONS
Index: trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/info.nib (revision 550)
+++ trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/info.nib (revision 551)
@@ -11,5 +11,5 @@
IBOpenObjects
- 507
+ 2
IBSystem Version
Index: trunk/Cocoa/Pester/Source/PSAlarm.m
===================================================================
--- trunk/Cocoa/Pester/Source/PSAlarm.m (revision 550)
+++ trunk/Cocoa/Pester/Source/PSAlarm.m (revision 551)
@@ -328,15 +328,25 @@
- (NSString *)intervalString;
{
- const unsigned long long mval = 99, minute = 60, hour = minute * 60;
+ const unsigned long long mval = 999, minute = 60, hour = minute * 60, day = hour * 24, week = day * 7;
unsigned long long interval = [self interval];
if (interval == 0) return nil;
+
if (interval == 1) return @"One second";
if (interval == minute) return @"One minute";
+ if (interval == hour) return @"One hour";
+ if (interval == day) return @"One day";
+ if (interval == week) return @"One week";
+
+ if (interval % week == 0) return [NSString stringWithFormat: @"%u weeks", (unsigned)(interval / week)];
+ if (interval % day == 0) return [NSString stringWithFormat: @"%u days", (unsigned)(interval / day)];
+ if (interval % hour == 0) return [NSString stringWithFormat: @"%u hours", (unsigned)(interval / hour)];
if (interval % minute == 0) return [NSString stringWithFormat: @"%u minutes", (unsigned)(interval / minute)];
+
if (interval <= mval) return [NSString stringWithFormat: @"%u seconds", (unsigned)interval];
- if (interval == hour) return @"One hour";
- if (interval % hour == 0) return [NSString stringWithFormat: @"%u hours", (unsigned)(interval / hour)];
if (interval <= mval * minute) return [NSString stringWithFormat: @"%u minutes", (unsigned)(interval / minute)];
if (interval <= mval * hour) return [NSString stringWithFormat: @"%u hours", (unsigned)(interval / hour)];
+ if (interval <= mval * day) return [NSString stringWithFormat: @"%u days", (unsigned)(interval / day)];
+ return [NSString stringWithFormat: @"%u weeks", (unsigned)(interval / week)];
+
return [self _stringForInterval: interval];
}