Changeset 735 for trunk/macosx

Timestamp:

Aug 7, 2006, 2:28:31 AM (16 years ago)

Author:

livings124

Message:

User can now choose the sound that plays.

Location:

trunk/macosx

Files:

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

trunk/macosx/Controller.m

@@ -901 +901 @@
     {
         NSSound * sound;
-        if ((sound = [NSSound soundNamed: @"Glass"]))
+        if ((sound = [NSSound soundNamed: [fDefaults stringForKey: @"DownloadSound"]]))
             [sound play];
     }
@@ -1348 +1348 @@
     {
         NSSound * sound;
-        if ((sound = [NSSound soundNamed: @"Submarine"]))
+        if ((sound = [NSSound soundNamed: [fDefaults stringForKey: @"SeedingSound"]]))
             [sound play];
     }

trunk/macosx/Defaults.plist

@@ -35 +35 @@
         <key>DownloadLimit</key>
         <integer>100</integer>
+        <key>DownloadSound</key>
+        <string>Glass</string>
         <key>Filter</key>
         <string>None</string>
@@ -61 +63 @@
         <key>SavePrivateTorrent</key>
         <true/>
+        <key>SeedingSound</key>
+        <string>Submarine</string>
         <key>ShowInspector</key>
         <false/>

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

@@ -19 +19 @@
                 setRatioCheck = id; 
                 setShowMessage = id; 
+                setSound = id; 
                 setSpeedLimit = id; 
                 setStartSetting = id; 
@@ -36 +37 @@
                 fDownloadCheck = NSButton; 
                 fDownloadField = NSTextField; 
+                fDownloadSoundPopUp = NSPopUpButton; 
                 fFolderPopUp = NSPopUpButton; 
                 fGeneralView = NSView; 
@@ -49 +51 @@
                 fRemoveCheck = NSButton; 
                 fRemoveDownloadingCheck = NSButton; 
+                fSeedingSoundPopUp = NSPopUpButton; 
                 fSpeedLimitDownloadField = NSTextField; 
                 fSpeedLimitUploadField = NSTextField; 

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

@@ -12 +12 @@
                 <string>139 281 538 290 0 0 1152 842 </string>
                 <key>41</key>
-                <string>115 371 538 378 0 0 1152 842 </string>
+                <string>307 386 538 386 0 0 1152 842 </string>
                 <key>66</key>
                 <string>353 613 538 104 0 0 1152 842 </string>

trunk/macosx/PrefsController.h

@@ -34 +34 @@
     IBOutlet NSView         * fGeneralView, * fTransfersView, * fBandwidthView, * fNetworkView;
     
-    IBOutlet NSPopUpButton  * fFolderPopUp, * fImportFolderPopUp;
+    IBOutlet NSPopUpButton  * fFolderPopUp, * fImportFolderPopUp,
+                            * fDownloadSoundPopUp, * fSeedingSoundPopUp;
     IBOutlet NSButton       * fQuitCheck, * fRemoveCheck,
                             * fQuitDownloadingCheck, * fRemoveDownloadingCheck,
@@ -67 +68 @@
 - (void) setBadge:          (id) sender;
 - (void) setPlaySound:      (id) sender;
+- (void) setSound:          (id) sender;
 - (void) setUpdate:         (id) sender;
 - (void) checkUpdate;

trunk/macosx/PrefsController.m

@@ -193 +193 @@
     
     //set play sound
-    [fPlayDownloadSoundCheck setState: [fDefaults boolForKey: @"PlayDownloadSound"]];
-    [fPlaySeedingSoundCheck setState: [fDefaults boolForKey: @"PlaySeedingSound"]];
+    NSMutableArray * sounds = [NSMutableArray array];
+    NSEnumerator * soundEnumerator,
+                * soundDirectoriesEnumerator = [[NSArray arrayWithObjects: @"System/Library/Sounds", @"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];
+    
+    BOOL playDownloadSound = [fDefaults boolForKey: @"PlayDownloadSound"];
+    [fPlayDownloadSoundCheck setState: playDownloadSound];
+    [fDownloadSoundPopUp setEnabled: playDownloadSound];
+    
+    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];
+    
+    BOOL playSeedingSound = [fDefaults boolForKey: @"PlaySeedingSound"];
+    [fPlaySeedingSoundCheck setState: playSeedingSound];
+    [fSeedingSoundPopUp setEnabled: playSeedingSound];
+    
+    int seedingSoundIndex = [fDownloadSoundPopUp indexOfItemWithTitle: [fDefaults stringForKey: @"SeedingSound"]];
+    if (seedingSoundIndex >= 0)
+        [fSeedingSoundPopUp selectItemAtIndex: seedingSoundIndex];
+    else
+        [fDefaults setObject: [fSeedingSoundPopUp titleOfSelectedItem] forKey: @"SeedingSound"];
     
     //set start setting
@@ -517 +560 @@
 - (void) setPlaySound: (id) sender
 {
+    BOOL state = [sender state];
+
     if (sender == fPlayDownloadSoundCheck)
-        [fDefaults setBool: [sender state] forKey: @"PlayDownloadSound"];
+    {
+        [fDownloadSoundPopUp setEnabled: state];
+        [fDefaults setBool: state forKey: @"PlayDownloadSound"];
+    }
     else if (sender == fPlaySeedingSoundCheck)
-        [fDefaults setBool: [sender state] forKey: @"PlaySeedingSound"];
+    {
+        [fSeedingSoundPopUp setEnabled: state];
+        [fDefaults setBool: state forKey: @"PlaySeedingSound"];
+    }
+    else;
+}
+
+- (void) setSound: (id) sender
+{
+    //play sound when selecting
+    NSString * soundName = [sender titleOfSelectedItem];
+    NSSound * sound;
+    if ((sound = [NSSound soundNamed: soundName]))
+        [sound play];
+
+    if (sender == fDownloadSoundPopUp)
+        [fDefaults setObject: soundName forKey: @"DownloadSound"];
+    else if (sender == fSeedingSoundPopUp)
+        [fDefaults setObject: soundName forKey: @"SeedingSound"];
     else;
 }