Changeset 1038

Timestamp:

Oct 29, 2006, 5:05:27 PM (16 years ago)

Author:

livings124

Message:

bind sound popups and catch if auto speed limit times are the same

Location:

trunk/macosx

Files:

• Controller.m (modified) (2 diffs)
• English.lproj/PrefsWindow.nib/info.nib (modified) (1 diff)
• English.lproj/PrefsWindow.nib/keyedobjects.nib (modified) (previous)
• PrefsController.h (modified) (1 diff)
• PrefsController.m (modified) (4 diffs)

trunk/macosx/Controller.m

@@ -1324 +1324 @@
     BOOL shouldBeOn;
     int hour = [[NSCalendarDate calendarDate] hourOfDay];
-    if (onHour < offHour)
+    
+    if (onHour == offHour)
+        shouldBeOn = NO;
+    else if (onHour < offHour)
         shouldBeOn = hour >= onHour && hour < offHour;
     else
@@ -1341 +1344 @@
     NSCalendarDate * currentDate = [NSCalendarDate calendarDate];
     if ([currentDate minuteOfHour] == 0 && [currentDate secondOfMinute] < AUTO_SPEED_LIMIT_SECONDS
-            && [currentDate hourOfDay] == [fDefaults integerForKey: fSpeedLimitEnabled
-                                            ? @"SpeedLimitAutoOffHour" : @"SpeedLimitAutoOnHour"])
+        && [currentDate hourOfDay] == [fDefaults integerForKey: fSpeedLimitEnabled
+                                        ? @"SpeedLimitAutoOffHour" : @"SpeedLimitAutoOnHour"]
+        && (fSpeedLimitEnabled || [fDefaults integerForKey: @"SpeedLimitAutoOnHour"]
+                                    != [fDefaults integerForKey: @"SpeedLimitAutoOffHour"]))
     {
         [self toggleSpeedLimit: nil];

trunk/macosx/English.lproj/PrefsWindow.nib/info.nib

@@ -12 +12 @@
                 <string>294 434 563 290 0 0 1152 842 </string>
                 <key>41</key>
-                <string>138 348 563 317 0 0 1152 842 </string>
+                <string>294 420 563 317 0 0 1152 842 </string>
                 <key>66</key>
                 <string>294 507 563 144 0 0 1152 842 </string>

trunk/macosx/PrefsController.h

@@ -39 +39 @@
     IBOutlet NSPopUpButton  * fFolderPopUp, * fImportFolderPopUp,
                             * fDownloadSoundPopUp, * fSeedingSoundPopUp;
+    
+    NSArray                 * fSounds;
     
     SUUpdater               * fUpdater;

trunk/macosx/PrefsController.m

@@ -80 +80 @@
         //actually set bandwidth limits
         [self applySpeedSettings: nil];
+        
+        //set play sound
+        NSMutableArray * sounds = [NSMutableArray array];
+        NSEnumerator * soundEnumerator,
+                    * soundDirectoriesEnumerator = [[NSArray arrayWithObjects: @"System/Library/Sounds",
+                            [NSHomeDirectory() stringByAppendingPathComponent: @"Library/Sounds"], nil] objectEnumerator];
+        NSString * soundPath, * sound;
+        
+        //get list of all sounds and sort alphabetically
+        while ((soundPath = [soundDirectoriesEnumerator nextObject]))
+            if (soundEnumerator = [[NSFileManager defaultManager] enumeratorAtPath: soundPath])
+                while ((sound = [soundEnumerator nextObject]))
+                {
+                    sound = [sound stringByDeletingPathExtension];
+                    if ([NSSound soundNamed: sound])
+                        [sounds addObject: sound];
+                }
+        
+        fSounds = [[sounds sortedArrayUsingSelector: @selector(caseInsensitiveCompare:)] retain];
     }
     return self;
@@ -88 +107 @@
     if (fNatStatusTimer)
         [fNatStatusTimer invalidate];
+    [fSounds release];
     
     [super dealloc];
@@ -119 +139 @@
     fNatStatusTimer = [NSTimer scheduledTimerWithTimeInterval: 5.0 target: self
                         selector: @selector(updateNatStatus) userInfo: nil repeats: YES];
-    
-    //set play sound
-    NSMutableArray * sounds = [NSMutableArray array];
-    NSEnumerator * soundEnumerator,
-                * soundDirectoriesEnumerator = [[NSArray arrayWithObjects: @"System/Library/Sounds",
-                        [NSHomeDirectory() stringByAppendingPathComponent: @"Library/Sounds"], nil] objectEnumerator];
-    NSString * soundPath, * sound;
-    
-    //get list of all sounds and sort alphabetically
-    while ((soundPath = [soundDirectoriesEnumerator nextObject]))
-        if (soundEnumerator = [[NSFileManager defaultManager] enumeratorAtPath: soundPath])
-            while ((sound = [soundEnumerator nextObject]))
-            {
-                sound = [sound stringByDeletingPathExtension];
-                if ([NSSound soundNamed: sound])
-                    [sounds addObject: sound];
-            }
-    
-    [sounds sortUsingSelector: @selector(caseInsensitiveCompare:)];
-    
-    //set download sound
-    [fDownloadSoundPopUp removeAllItems];
-    [fDownloadSoundPopUp addItemsWithTitles: sounds];
-    
-    int downloadSoundIndex = [fDownloadSoundPopUp indexOfItemWithTitle: [fDefaults stringForKey: @"DownloadSound"]];
-    if (downloadSoundIndex >= 0)
-        [fDownloadSoundPopUp selectItemAtIndex: downloadSoundIndex];
-    else
-        [fDefaults setObject: [fDownloadSoundPopUp titleOfSelectedItem] forKey: @"DownloadSound"];
-    
-    //set seeding sound
-    [fSeedingSoundPopUp removeAllItems];
-    [fSeedingSoundPopUp addItemsWithTitles: sounds];
-    
-    int seedingSoundIndex = [fDownloadSoundPopUp indexOfItemWithTitle: [fDefaults stringForKey: @"SeedingSound"]];
-    if (seedingSoundIndex >= 0)
-        [fSeedingSoundPopUp selectItemAtIndex: seedingSoundIndex];
-    else
-        [fDefaults setObject: [fSeedingSoundPopUp titleOfSelectedItem] forKey: @"SeedingSound"];
 
     //set update check
@@ -359 +340 @@
     if ((sound = [NSSound soundNamed: soundName]))
         [sound play];
-
-    #warning use bindings
-    if (sender == fDownloadSoundPopUp)
-        [fDefaults setObject: soundName forKey: @"DownloadSound"];
-    else if (sender == fSeedingSoundPopUp)
-        [fDefaults setObject: soundName forKey: @"SeedingSound"];
-    else;
 }