Changeset 551

Timestamp:

07/18/09 05:59:22 (15 years ago)

Author:

Nicholas Riley

Message:

Maximum interval is now 999 weeks.

Location:

trunk/Cocoa/Pester

Files:

• Documentation/Read Me.rtfd/TXT.rtf (modified) ( previous)
• Pester to do.oo3/contents.xml (modified) ( previous)
• Source/English.lproj/MainMenu.nib/classes.nib (modified) (2 diffs)
• Source/English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• Source/English.lproj/MainMenu.nib/keyedobjects.nib (modified) ( previous)
• Source/PSAlarm.m (modified) (1 diff)

trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/classes.nib

@@ -17 +17 @@
                         <key>SUPERCLASS</key>
                         <string>NSPopUpButton</string>
+                </dict>
+                <dict>
+                        <key>CLASS</key>
+                        <string>NSDisclosureButtonCell</string>
+                        <key>LANGUAGE</key>
+                        <string>ObjC</string>
+                        <key>SUPERCLASS</key>
+                        <string>NSButtonCell</string>
                 </dict>
                 <dict>
@@ -119 +127 @@
                 </dict>
                 <dict>
-                        <key>CLASS</key>
-                        <string>NSDisclosureButtonCell</string>
-                        <key>LANGUAGE</key>
-                        <string>ObjC</string>
-                        <key>SUPERCLASS</key>
-                        <string>NSButtonCell</string>
-                </dict>
-                <dict>
                         <key>ACTIONS</key>
                         <dict>

trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/info.nib

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>507</integer>
+                <integer>2</integer>
         </array>
         <key>IBSystem Version</key>

trunk/Cocoa/Pester/Source/PSAlarm.m

@@ -328 +328 @@
 - (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];
 }